优化需求

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml

@@ -208,25 +208,21 @@ order by create_date desc
         <where>
             <include refid="selectAuthSql"/>
             <if test="info.projectName!=null and info.projectName!=''">
-                <bind name="tempStr" value="'%' + info.projectName + '%'" />
-                and u.project_name like  #{tempStr}
+                <bind name="projectName" value="'%' + info.projectName + '%'" />
+                and u.project_name like  #{projectName}
             </if>
 
             <if test="info.adminDivision!=null and info.adminDivision!=''">
-                <bind name="tempStr" value="'%' + info.adminDivision + '%'" />
-                and u.admin_division like  #{tempStr}
-            </if>
-            <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="adminDivision" value="'%' + info.adminDivision + '%'" />
+                and u.admin_division like  #{adminDivision}
             </if>
             <if test="info.workplaceProperties!=null and info.workplaceProperties!=''">
-                <bind name="tempStr" value="'%' + info.workplaceProperties + '%'" />
-                and u.workplace_properties like  #{tempStr}
+                <bind name="workplaceProperties" value="'%' + info.workplaceProperties + '%'" />
+                and u.workplace_properties like  #{workplaceProperties}
             </if>
             <if test="info.dutyWorkplace!=null and info.dutyWorkplace!=''">
-                <bind name="tempStr" value="'%' + info.dutyWorkplace + '%'" />
-                and u.duty_workplace like  #{tempStr}
+                <bind name="dutyWorkplace" value="'%' + info.dutyWorkplace + '%'" />
+                and u.duty_workplace like  #{dutyWorkplace}
             </if>
             <if test="info.reformName!=null and info.reformName!=''">
                 and u.reform_name =  #{info.reformName}

huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/WorkflowMapper.xml

@@ -51,6 +51,7 @@
         GROUP BY
             super_leader,
             reform_name
+        order by super_leader, reform_name
     </select>
     <select id="getUnApprovedDays" resultType="Integer">
     SELECT

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouFieldchangehistoryServiceImpl.java

@@ -72,7 +72,7 @@ public class HuzhouFieldchangehistoryServiceImpl extends ServiceImpl<HuzhouField
         String newValue = "";
         //查询当前字段是否在流程中
         LambdaQueryWrapper<HuzhouFieldchangehistory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(HuzhouFieldchangehistory::getFieldValue,fieldValue);
+        queryWrapper.like(HuzhouFieldchangehistory::getFieldValue,fieldValue);
         queryWrapper.eq(HuzhouFieldchangehistory::getProjectid,projectid);
         queryWrapper.eq(HuzhouFieldchangehistory::getStatus,"1");
         List<HuzhouFieldchangehistory> fieldchangehistoryList = fieldchangehistoryMapper.selectList(queryWrapper);

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java

@@ -609,7 +609,7 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl<HuzhouPlaninfoMapper,
 
     @Override
     public IPage<HuzhouProjectinfoOV> projectPlanPageList(HuzhouProjectinfo projectinfo, Integer pageNo, Integer pageSize, String newStage) {
-//        runtimeService.deleteProcessInstance("400001","停止流程");
+//        runtimeService.deleteProcessInstance("412777","停止流程");
 
         IPage<HuzhouProjectinfoOV> infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage);
         return infoPageList;

huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/WorkflowServiceImpl.java

@@ -815,7 +815,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
         info.getRecords().forEach(item -> {
             List<Integer> unApprovedDays = workflowMapper.getUnApprovedDays(item.getSuperLeader(), item.getReformName());
             if(unApprovedDays!=null&&unApprovedDays.size()>0){
-                 item.setUnapprovedCount(unApprovedDays.stream().filter(count -> count==0).count());
+                 item.setUnapprovedCount(unApprovedDays.stream().count());
                  item.setUnapprovedCount2d(unApprovedDays.stream().filter(count -> count==2).count());
                  item.setUnapprovedCount3d(unApprovedDays.stream().filter(count -> count==3).count());
                  item.setUnapprovedCount5d(unApprovedDays.stream().filter(count -> count==5).count());
@@ -839,7 +839,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
         urtDepInfo.getRecords().forEach(item -> {
             List<Integer> unApprovedDays = workflowMapper.getURTUnApprovedDays(item.getUrtDep().replace("负责人",""));
             if(unApprovedDays!=null&&unApprovedDays.size()>0){
-                 item.setUnapprovedCount(unApprovedDays.stream().filter(count -> count==0).count());
+                 item.setUnapprovedCount(unApprovedDays.stream().count());
                  item.setUnapprovedCount2d(unApprovedDays.stream().filter(count -> count==2).count());
                  item.setUnapprovedCount3d(unApprovedDays.stream().filter(count -> count==3).count());
                  item.setUnapprovedCount5d(unApprovedDays.stream().filter(count -> count==5).count());