优化代码结构

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

@@ -460,12 +460,6 @@
             <if test="projectId !=null">
                 AND o.project_id = #{projectId}
             </if>
-            <if test="type !=null and type>2 ">
-                AND o.type = #{type}
-                <if test="deptId !=null">
-                    AND o.dept_id = #{deptId}
-                </if>
-            </if>
             <if test="startDate !=null">
                 AND o.work_day >= #{startDate}
             </if>
@@ -475,7 +469,23 @@
             <if test="userName !=null">
                 AND u.name like  concat('%',#{userName},'%')
             </if>
+            <if test="type !=null and type>2 ">
+                AND o.type = #{type}
+                <if test="deptId !=null">
+                    AND o.dept_id = #{deptId}
+                </if>
+                <if test="startDate !=null">
+                    AND o.work_day >= #{startDate}
+                </if>
+                <if test="endDate !=null">
+                    AND o.work_day &lt;= #{endDate}
+                </if>
+                <if test="userName !=null">
+                    AND u.name like  concat('%',#{userName},'%')
+                </if>
+            </if>
+
         </where>
-        ORDER BY CONVERT( u.name USING gbk ), o.work_day desc
+        ORDER BY  o.work_day desc
     </select>
 </mapper>

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

@@ -5,6 +5,7 @@ import cn.wisenergy.common.utils.exception.BASE_RESP_CODE_ENUM;
 import cn.wisenergy.common.utils.exception.BaseCustomException;
 import cn.wisenergy.mapper.WorkCentreMapper;
 import cn.wisenergy.mapper.WorkDeptMapper;
+import cn.wisenergy.mapper.WorkProjectChangeMapper;
 import cn.wisenergy.mapper.WorkProjectMapper;
 import cn.wisenergy.model.app.*;
 import cn.wisenergy.model.dto.*;
@@ -28,7 +29,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +71,8 @@ public class WorkProjectServiceImpl implements WorkProjectService {
     @Autowired
     private WorkTypeService workTypeService;
 
+    @Autowired
+    private WorkProjectChangeMapper workProjectChangeMapper;
 
     /**
      * 功能：根据项目id获取项目
@@ -279,14 +285,14 @@ public class WorkProjectServiceImpl implements WorkProjectService {
         workProjectMapper.updateIsConclusionById(projectId);
 
         // 插入更变日志
-       /* List<WorkProjectChange> workProjectChanges = new ArrayList<>();
+        List<WorkProjectChange> workProjectChanges = new ArrayList<>();
         WorkProjectChange workProjectChange = new WorkProjectChange();
         workProjectChange.setProjectId(projectId);
         workProjectChange.setReviserId(userId);
         workProjectChange.setModifyTime(new Date());
         workProjectChange.setOperationType(3);
         workProjectChanges.add(workProjectChange);
-        workProjectChangeService.insertbatch(workProjectChanges);*/
+        workProjectChangeService.insertbatch(workProjectChanges);
 
         return true;
     }
@@ -577,12 +583,12 @@ public class WorkProjectServiceImpl implements WorkProjectService {
             workUserProjectService.insertBatch(createProjectVo.getUserIds(), workProject.getId());
         }
         // 插入更变日志
-       /* WorkProjectChange workProjectChange = new WorkProjectChange();
+        WorkProjectChange workProjectChange = new WorkProjectChange();
         workProjectChange.setProjectId(workProject.getId());
         workProjectChange.setReviserId(createProjectVo.getCreatorId());
         workProjectChange.setModifyTime(new Date());
         workProjectChange.setOperationType(1);
-        int insert1 = workProjectChangeMapper.insert(workProjectChange);*/
+        int insert1 = workProjectChangeMapper.insert(workProjectChange);
 
         return true;
     }

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

@@ -1240,7 +1240,7 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
         }
 
         // 增加记录
-        addWorkOrderChange(OrderChangeEnum.CREATE.getContent(), vo);
+        addWorkOrderChange(OrderChangeEnum.DELETE.getContent(), vo);
 
         return true;
     }