优化代码结构

wisenergy-mapper/src/main/resources/mapper/WorkOrderChangeMapper.xml

@@ -15,10 +15,10 @@
         <where>
             <if test="projectIds !=null and projectIds.size()>0">
             <if test="startDate !=null">
-                AND oc.change_date >= #{startDate}
+                AND DATE_FORMAT(oc.change_date, '%Y%m%d') >= DATE_FORMAT(#{startDate} ,'%Y%m%d')
             </if>
             <if test="endDate !=null">
-                AND oc.change_date &lt;= #{endDate}
+                AND DATE_FORMAT(oc.change_date, '%Y%m%d') &lt;= DATE_FORMAT(#{endDate} ,'%Y%m%d')
             </if>
             <if test="userName !=null">
                 AND (u2.name like concat('%',#{userName},'%')
@@ -44,10 +44,10 @@
                     </foreach>
                 </if>
                 <if test="startDate !=null">
-                    AND oc.change_date >= #{startDate}
+                    AND DATE_FORMAT(oc.change_date, '%Y%m%d') >= DATE_FORMAT(#{startDate} ,'%Y%m%d')
                 </if>
                 <if test="endDate !=null">
-                    AND oc.change_date &lt;= #{endDate}
+                    AND DATE_FORMAT(oc.change_date, '%Y%m%d') &lt;= DATE_FORMAT(#{endDate} ,'%Y%m%d')
                 </if>
                 <if test="userName !=null">
                     AND (u2.name like concat('%',#{userName},'%')

wisenergy-mapper/src/main/resources/mapper/WorkProjectMapper.xml

@@ -291,17 +291,18 @@
     </resultMap>
 
     <select id="getOrderChangeTypeDtos" resultMap="orderChangeType">
-        select p.type,t.name 'type_name',p.id 'project_id',p.project_name,up.user_id,u.name 'user_name',u.dept_id,d.dept_name
-from work_project p LEFT JOIN work_user_project up on p.id = up.project_id
-LEFT JOIN work_user u ON up.user_id = u.id
-LEFT JOIN work_dept d ON d.id = u.dept_id
-LEFT JOIN work_type t ON p.type = t.id
+        select p.type,t.name 'type_name',p.id 'project_id',p.project_name,up.user_id,u.name 'user_name',u.dept_id,d.dept_name,d1.id,d1.dept_name
+        from work_project p LEFT JOIN work_user_project up on p.id = up.project_id
+        LEFT JOIN work_user u ON up.user_id = u.id
+        LEFT JOIN (select id,dept_name,sort FROM work_dept)d1 ON d1.id = p.dept_id
+        LEFT JOIN work_dept d ON d.id = u.dept_id
+        LEFT JOIN work_type t ON p.type = t.id
 <where>
     <if test="userId !=null">
      AND   p.manager_id = #{userId}
     </if>
 </where>
-
+       ORDER BY t.sort,d1.sort,p.id
     </select>
 
 

wisenergy-model/src/main/java/cn/wisenergy/model/dto/OrderChangeProjectDto.java

@@ -9,11 +9,14 @@ import java.util.List;
  * @QQ1799796883
  */
 @Data
-public class OrderChangeProjectDto {
+public class OrderChangeProjectDto{
 
     private Integer projectId;
 
     private String projectName;
 
     private List<DeptUserDto> deptUserDtos;
+
+
+
 }

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectManagerDto.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="ProjectManagerDto", description="可审批的项目")
-public class ProjectManagerDto implements Comparable<ProjectManagerDto>{
+public class ProjectManagerDto implements Comparable<ProjectManagerDto> {
 
     @ApiModelProperty(name = "id",value = "主键id")
     @TableId(value = "id", type = IdType.AUTO)
@@ -40,4 +40,6 @@ public class ProjectManagerDto implements Comparable<ProjectManagerDto>{
         return -this.pendingApprovalTimes.compareTo(o.pendingApprovalTimes);
     }
 
+
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/WorkTimeOrderService.java

@@ -141,5 +141,5 @@ public interface WorkTimeOrderService {
     Boolean updateOrderChange(OrderChangeVo vo);
 
 
-    Boolean deleteOrderChange(Integer workId, Integer operator);
+    Boolean deleteOrderChange(Integer workId, Integer operator,String changeReason);
 }

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkProjectServiceImpl.java

@@ -29,10 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -351,7 +351,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         if (CollectionUtils.isEmpty(ts)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
-
         ts.forEach(t ->{
             if (t instanceof WorkTimeOrder) {
                 list.add((WorkTimeOrder) t);
@@ -1177,7 +1176,6 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
             workTimeOrders.removeIf(workTimeOrder -> workTimeOrder.getWorkId().equals(vo.getWorkId()));
         }
         totalTime = timeNotEight(totalTime, workTimeOrders);
-        System.out.println("3333333333");
         // 4.判断工时类型是否重复
         List<WorkTimeOrder> workTimeOrderList = new ArrayList<>(8);
         if (!CollectionUtils.isEmpty(workTimeOrders)) {
@@ -1220,9 +1218,9 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
 
     @Transactional
     @Override
-    public Boolean deleteOrderChange(Integer workId, Integer operator) {
-        log.info("WorkTimeOrderServiceImpl[]deleteOrderChange[]input.param.workId:{},operator:{}" + workId, operator);
-        if (null == workId || null == operator) {
+    public Boolean deleteOrderChange(Integer workId, Integer operator,String changeReason) {
+        log.info("WorkTimeOrderServiceImpl[]deleteOrderChange[]input.param.workId:{},operator:{},changeReason:{}" + workId, operator,changeReason);
+        if (null == workId || null == operator || StringUtils.isBlank(changeReason)) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.INPUT_PARAM_IS_NULL);
         }
         if (!UserRoleLevelUtils.isManagerLevel(operator, LevelEnum.WORKORDER_CHANGEMANAGEMENT.getLevelName())) {
@@ -1260,7 +1258,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                 throw new BaseCustomException(BASE_RESP_CODE_ENUM.FAILEDTO_DELETE_DATA);
             }
         }
-
+        vo.setChangeReason(changeReason);
         // 增加记录
         addWorkOrderChange(OrderChangeEnum.DELETE.getContent(), vo);
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/WorkTimeOrderController.java

@@ -205,12 +205,13 @@ public class WorkTimeOrderController extends BaseController {
     @ApiOperation(value = "删除工单",notes = "删除工单",httpMethod = "DELETE")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "workId",value = "工单id",dataType = "int",required = true),
-            @ApiImplicitParam(name = "operator",value = "操作者",dataType = "int",required = true)
+            @ApiImplicitParam(name = "operator",value = "操作者",dataType = "int",required = true),
+            @ApiImplicitParam(name = "changeReason",value = "删除理由",dataType = "String",required = true)
     })
     @DeleteMapping("/deleteOrderChange")
-    public Result deleteOrderChange(Integer workId,Integer operator) {
-        log.info("WorkTimeOrderController[]deleteOrderChange[]input.param.workId:{},operator:{}" + workId,operator);
-        Boolean aBoolean = workTimeOrderService.deleteOrderChange(workId, operator);
+    public Result deleteOrderChange(Integer workId,Integer operator,String changeReason) {
+        log.info("WorkTimeOrderController[]deleteOrderChange[]input.param.workId:{},operator:{},changeReason:{}" + workId,operator,changeReason);
+        Boolean aBoolean = workTimeOrderService.deleteOrderChange(workId, operator,changeReason);
         return getResult(aBoolean);
     }