"工程台账"

common/src/main/java/com/tofly/common/constant/SysConstants.java

@@ -34,12 +34,12 @@ public class SysConstants {
     public static final String PWD_BEARER = "{bcrypt}";
 
     /**
-     * 新增用户默认密码六个零的hash值
+     * 新增用户默认密码：Zmgc@2024的hash值
      */
-    public static String defaultPwd = "c984aed014aec7623a54f0591da07a85fd4b762d";
+    public static String defaultPwd = "cb0f5d14f2a276df04ca1951486bf6f9533ac605";
 
     /**
-     * 获取加密后的默认000000密码
+     * 获取加密后的默认密码：Zmgc@2024
      * @return 加密后的密码
      */
     public static String getUserDefaultPwd(){

system/src/main/java/com/tofly/system/controller/SysUserController.java

@@ -143,7 +143,7 @@ public class SysUserController extends BaseController {
         //清空登录缓存
         List<Long> ids = new ArrayList<>(userIds);
         sysUserService.clearCached(ids);
-        return ResultData.ok(update ? "重置成功，新密码：000000" : ResultEnum.UPDATE_FAIL);
+        return ResultData.ok(update ? "重置成功，新密码：Zmgc@2024" : ResultEnum.UPDATE_FAIL);
     }
 
     /**

workflow/src/main/java/com/tofly/workflow/process/service/impl/TfProcessLServiceImpl.java

@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tofly.common.oauth.util.SecurityUtils;
 import com.tofly.workflow.baseconf.entity.TfTaskP;
 import com.tofly.workflow.baseconf.service.TfTaskPService;
+import com.tofly.workflow.buss.entity.TfContractW;
+import com.tofly.workflow.buss.entity.TfDesignBudgetW;
 import com.tofly.workflow.common.FlowConstant;
 import com.tofly.workflow.process.entity.TfNowHandleL;
 import com.tofly.workflow.process.entity.TfProcessL;
@@ -213,7 +215,57 @@ public class TfProcessLServiceImpl extends ServiceImpl<TfProcessLMapper, TfProce
 
             }
         }
-        return vo;
+        List<ProcessNodeVo> nodes = vo.getNodes();
+        if (CollUtil.isEmpty(nodes)) {
+            return vo;
+        }
+        if (!nodes.get(0).getPageCode().equals("contractCheck_addProject")
+                && !nodes.get(0).getPageCode().equals("designBudget_addBudget")) {
+            return vo;
+        }
+        if (nodes.get(0).getPageCode().equals("contractCheck_addProject")
+                && CollUtil.isEmpty((List<TfContractW>) nodes.get(0).getDataMap())) {
+            List<ProcessNodeVo> midNodes = new ArrayList<>();
+            nodes.forEach(node -> {
+                if (StringUtils.isNotEmpty(node.getPageCode())
+                        && node.getPageCode().equals("contractCheck_addProject")
+                        && node.getIsValid() != null
+                        && node.getIsValid() == (short) 0) {
+                    midNodes.add(node);
+                }
+            });
+            if (CollUtil.isNotEmpty(midNodes)) {
+                ProcessNodeVo resNode = midNodes.get(0);
+                resNode.setId(null);
+                resNode.setIsValid((short) 1);
+                resNode.setIsValidName("有效");
+                nodes.set(0, resNode);
+            }
+            vo.setNodes(nodes);
+            return vo;
+        } else if (nodes.get(0).getPageCode().equals("designBudget_addBudget")
+                && CollUtil.isEmpty((List<TfDesignBudgetW>) nodes.get(0).getDataMap())) {
+            List<ProcessNodeVo> midNodes = new ArrayList<>();
+            nodes.forEach(node -> {
+                if (StringUtils.isNotEmpty(node.getPageCode())
+                        && node.getPageCode().equals("designBudget_addBudget")
+                        && node.getIsValid() != null
+                        && node.getIsValid() == (short) 0) {
+                    midNodes.add(node);
+                }
+            });
+            if (CollUtil.isNotEmpty(midNodes)) {
+                ProcessNodeVo resNode = midNodes.get(0);
+                resNode.setId(null);
+                resNode.setIsValid((short) 1);
+                resNode.setIsValidName("有效");
+                nodes.set(0, resNode);
+            }
+            vo.setNodes(nodes);
+            return vo;
+        } else {
+            return vo;
+        }
     }
 
 

workflow/src/main/java/com/tofly/workflow/report/ReportController.java

@@ -43,11 +43,11 @@ private final ReportService reportService;
     @GetMapping("/signAndApplyExport" )
     @ApiOperation(value = "登记申请导出")
     public void getTfNowHandleLPageExport(@ModelAttribute ReportDto reportDto) {
-        Page page =new Page();
+//        Page page =new Page();
-        page.setSize(999999l);
+//        page.setSize(999999l);
-        final Page<SignApplyVo> signAndApplyData = reportService.getSignAndApplyData(page, reportDto);
+        final List<SignApplyVo> signAndApplyData = reportService.getSignAndApplyData(reportDto);
 
-        ExcelUtils.getListToExcel(SignApplyVo.class,signAndApplyData.getRecords(),"登记申请信息");
+        ExcelUtils.getListToExcel(SignApplyVo.class,signAndApplyData,"登记申请信息");
     }
 
     @GetMapping("/dispatchCount" )

workflow/src/main/java/com/tofly/workflow/report/mapper/ReportMapper.java

@@ -12,7 +12,9 @@ import java.util.List;
 
 public interface ReportMapper extends BaseMapper<SignApplyVo> {
 
-    public Page<SignApplyVo> getSignAndApplyData(Page page, ReportDto reportDto);
+    public Page<SignApplyVo> getSignAndApplyData(Page page, @Param("reportDto") ReportDto reportDto);
+
+    public List<SignApplyVo> getSignAndApplyData(@Param("reportDto") ReportDto reportDto);
 
     public Page<ProjectDispatchVo> getDispatchCount(Page page, ReportDto reportDto);
 

workflow/src/main/java/com/tofly/workflow/report/service/ReportService.java

@@ -10,6 +10,8 @@ import java.util.List;
 public interface ReportService  extends IService<SignApplyVo> {
     public Page<SignApplyVo> getSignAndApplyData(Page page, ReportDto reportDto);
 
+    public List<SignApplyVo> getSignAndApplyData(ReportDto reportDto);
+
     public Page<ProjectDispatchVo> getDispatchCount(Page page, ReportDto reportDto);
 
     public  Page<NotInProjectVo> getNotInProjectVo(Page page, ReportDto reportDto);

workflow/src/main/java/com/tofly/workflow/report/service/impl/ReportServiceImpl.java

@@ -35,6 +35,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, SignApplyVo> im
         return baseMapper.getSignAndApplyData(page, reportDto);
     }
 
+    @Override
+    public List<SignApplyVo> getSignAndApplyData(ReportDto reportDto) {
+        return baseMapper.getSignAndApplyData(reportDto);
+    }
+
     @Override
     public Page<ProjectDispatchVo> getDispatchCount(Page page, ReportDto reportDto) {
         return baseMapper.getDispatchCount(page, reportDto);

workflow/src/main/java/com/tofly/workflow/report/vo/SignApplyVo.java

@@ -45,4 +45,10 @@ public class SignApplyVo {
     @Excel(name = "安装内容",column = "K")
     @ApiModelProperty(value = "安装内容")
     private String installContent;
+    @Excel(name = "登记人名称",column = "L")
+    @ApiModelProperty(value = "登记人名称")
+    private String registerStaffName;
+    @Excel(name = "当前流程环节",column = "M")
+    @ApiModelProperty(value = "当前流程环节")
+    private String labelName;
 }

workflow/src/main/resources/mapper/report/ReportMapper.xml

@@ -92,16 +92,33 @@
         b.REGISTER_TIME,
         b.REGION_NAME || ' ' || ADDRE address,
         b.USER_PHONE,
-        (select REAL_NAME from sys_user where id =duty_user) duty_user,-- 勘察人,
+        (select REAL_NAME from sys_user where id = duty_user) duty_user,-- 勘察人,
         b.SURVEY_DATE SURVEY_DATE,-- 勘察日期
         b.HOUSEHOLD_NUMBER ,--申请户数
         (select name from SYS_DICT where id = user_type) PROJECT_NATURE,--工程性质
         b.INSTALL_CONTENT, --安装内容
-        b.process_id
+        b.process_id,
-
+        m.NAME LABEL_NAME,
-        from TF_PROJECT_BASE_W b left join tf_process_l c on b.process_id = c.id
+        (select REAL_NAME from sys_user where id = b.REGISTER_STAFF) REGISTER_STAFF_NAME
-        where 1=1 and c.is_del=0
+        from TF_PROJECT_BASE_W b
-
+            left join tf_process_l c on b.process_id = c.id
+            LEFT JOIN
+                (
+                    SELECT
+                        PROCESS_ID,
+                        MAX( h.ID ) ID
+                    FROM TF_NOW_HANDLE_L h
+                        LEFT JOIN TF_CONFIG_STEP_USER_L su ON ( h.STEP_ID = su.STEP_ID AND h.STEP_NODE = su.STEP_NODE )
+                    WHERE
+                        su.USER_TYPE = 1
+                    GROUP BY
+                        PROCESS_ID
+                ) h ON b.PROCESS_ID = h.PROCESS_ID
+            LEFT JOIN TF_NOW_HANDLE_L nh ON ( b.PROCESS_ID = nh.PROCESS_ID AND h.ID = nh.ID )
+            LEFT JOIN SYS_MENU m ON nh.LABEL = m.ID
+        where
+            1=1
+            and c.is_del = 0
         <if test="reportDto !=null">
             <if test="reportDto.tenantId !=null and reportDto.tenantId !='' ">
                 and b.tenant_id=#{reportDto.tenantId}
@@ -123,8 +140,6 @@
                 instr (USER_PHONE,#{reportDto.keywords})>0
                 )
             </if>
-
-
             <if test="reportDto.processTypes!=null and reportDto.processTypes!=''.toString()">
                 AND b.process_type in
                 <foreach item="item" index="index" collection="reportDto.processTypes.split(',')" open="(" separator=","
@@ -132,7 +147,6 @@
                     #{item}
                 </foreach>
             </if>
-
             <if test="reportDto.projectNatureIds!=null and reportDto.projectNatureIds!=''.toString()">
                 AND user_type in
                 <foreach item="item" index="index" collection="reportDto.projectNatureIds.split(',')" open="("
@@ -140,10 +154,7 @@
                     #{item}
                 </foreach>
             </if>
-
         </if>
-
-
     </select>
     <select id="getDispatchCount" resultType="com.tofly.workflow.report.vo.ProjectDispatchVo">
         select duty_post_name,duty_user,