1.26增加采集设计页面功能

qianhe-gzpt/src/main/java/com/qianhe/controller/WorkXmController.java

@@ -145,7 +145,6 @@ public class WorkXmController extends BaseController
         List<Map<String,Object>> list = new ArrayList<>();
         for (WorkXmcb workXmcb : collect) {
             Map<String,Object> map = new HashMap<>();
-            if (workXmcb.getShzt().equals("同意") || workXmcb.getShzt().equals("符合条件")){
             switch (workXmcb.getShrlx()){
                 case "0":
                     map.put("jd","压裂通知");
@@ -154,11 +153,17 @@ public class WorkXmController extends BaseController
                     map.put("jd","采集设计");
                     break;
                 case "2":
+                    if (workXmcb.getShzt().equals("同意")){
                         map.put("jd","设计审核");
                         break;
+                    }
+                    break;
                 case "3":
+                    if (workXmcb.getShzt().equals("符合条件")){
                         map.put("jd","现场勘查");
                         break;
+                    }
+                    break;
                 default:
                     map.put("jd","");
                     break;
@@ -166,7 +171,6 @@ public class WorkXmController extends BaseController
             map.put("shsj",dateFormat.format(workXmcb.getShsj()));
             list.add(map);
         }
-        }
         ajaxResult.put("workXm",workXmVo);
 //        ajaxResult.put("spls",workXmcbs);
         ajaxResult.put("jdck",list);
@@ -229,4 +233,35 @@ public class WorkXmController extends BaseController
         util.exportExcel(response, list, "工作量统计");
     }
 
+    /**
+     * 查询采集设计列表
+     */
+    @GetMapping("/getCjsjList")
+    public TableDataInfo getCjsjList(WorkXm workXm){
+        //查询压裂通知已提交的项目
+        workXm.setTjzt("1");
+        startPage();
+        List<WorkXm> workXms = workXmService.selectWorkXmList(workXm);
+        return getDataTable(workXms);
+    }
+
+    /**
+     * 上传采集设计附件
+     */
+    @Log(title = "项目", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateFile")
+    public AjaxResult updateFile(@RequestBody WorkXmVo workXmVo)
+    {
+        return toAjax(workXmService.updateFile(workXmVo));
+    }
+
+    /**
+     * 提交采集设计
+     */
+    @PostMapping("/submitCjsj/{id}")
+    public AjaxResult submitCjsj(@PathVariable Long id){
+        WorkXm workXm = new WorkXm();
+        workXm.setId(id);
+        return toAjax(workXmService.submitCjsj(workXm));
+    }
 }

qianhe-gzpt/src/main/java/com/qianhe/domain/WorkXm.java

@@ -40,6 +40,9 @@ public class WorkXm
     @Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
     private String tjzt;
 
+    /** 采集设计提交状态（0未填报，1已填报，2未提交，3已提交） */
+    private String cjtjzt;
+
     /** 当前节点id */
     private Long dqjdId;
 

qianhe-gzpt/src/main/java/com/qianhe/service/IWorkXmService.java

@@ -89,4 +89,18 @@ public interface IWorkXmService
      * @return 项目集合
      */
     public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo);
+
+    /**
+     * 提交采集设计
+     * @param workXm
+     * @return
+     */
+    int submitCjsj(WorkXm workXm);
+
+    /**
+     * 上传采集设计附件
+     * @param workXmVo
+     * @return
+     */
+    int updateFile(WorkXmVo workXmVo);
 }

qianhe-gzpt/src/main/java/com/qianhe/service/impl/WorkXmServiceImpl.java

@@ -2,12 +2,15 @@ package com.qianhe.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.qianhe.common.exception.ServiceException;
 import com.qianhe.common.utils.DateUtils;
 import com.qianhe.common.utils.SecurityUtils;
 import com.qianhe.common.utils.StringUtils;
 import com.qianhe.domain.WorkAccessory;
 import com.qianhe.domain.WorkXmcb;
 import com.qianhe.mapper.WorkXmcbMapper;
+import com.qianhe.service.IWorkXmcbService;
 import com.qianhe.vo.WorkXmTjVo;
 import com.qianhe.vo.WorkXmVo;
 import org.springframework.beans.BeanUtils;
@@ -254,4 +257,107 @@ public class WorkXmServiceImpl implements IWorkXmService
     public List<WorkXm> selectWorkXmGzlList(WorkXmVo workXmVo) {
         return workXmMapper.selectWorkXmGzlList(workXmVo);
     }
+
+    /**
+     * 提交采集设计
+     * @param workXm
+     * @return
+     */
+    @Override
+    public int submitCjsj(WorkXm workXm) {
+        //修改该项目为第三节点
+        workXm.setCjtjzt("3");
+        workXm.setLczt("2");
+        workXm.setDqjdmc("设计审核");
+        int num = workXmMapper.updateWorkXm(workXm);
+        //增加审批历史
+        WorkXmcb workXmcb = new WorkXmcb();
+        workXmcb.setYltzId(workXm.getId());
+        workXmcb.setShrId(SecurityUtils.getUserId());
+        workXmcb.setShsj(DateUtils.getNowDate());
+        workXmcb.setShrlx("1");
+        workXmcb.setWczt("1");
+        workXmcb.setCreateBy(SecurityUtils.getUsername());
+        workXmcb.setCreateTime(DateUtils.getNowDate());
+        workXmcbMapper.insertWorkXmcb(workXmcb);
+        return num;
+    }
+
+    /**
+     * 上传采集设计附件
+     * @param workXmVo
+     * @return
+     */
+    @Override
+    public int updateFile(WorkXmVo workXmVo) {
+        //项目id
+        Long id = workXmVo.getId();
+        if (StringUtils.isNull(workXmVo.getJcsjtList()) && StringUtils.isNull(workXmVo.getBszbList()) && StringUtils.isNull(workXmVo.getSygcsjList()) && StringUtils.isNull(workXmVo.getQtList())){
+            throw new ServiceException("请上传附件!");
+        }
+        if (workXmVo.getJcsjtList().size() <= 0 && workXmVo.getBszbList().size() <= 0 &&workXmVo.getSygcsjList().size() <= 0 && workXmVo.getQtList().size() <= 0){
+            throw new ServiceException("请上传附件!");
+        }
+        //将之前上传附件删除,重新上传
+        workXmcbMapper.deleteFileByBusinessId(id,"项目-监测设计图");
+        workXmcbMapper.deleteFileByBusinessId(id,"项目-布设坐标");
+        workXmcbMapper.deleteFileByBusinessId(id,"项目-试油工程设计");
+        workXmcbMapper.deleteFileByBusinessId(id,"项目-其他附件");
+
+        //监测设计图集合
+        List<WorkAccessory> jcsjtList = workXmVo.getJcsjtList();
+        //布设坐标集合
+        List<WorkAccessory> bszbList = workXmVo.getBszbList();
+        //试油工程设计集合
+        List<WorkAccessory> sygcsjList = workXmVo.getSygcsjList();
+        //其他附件集合
+        List<WorkAccessory> qtList = workXmVo.getQtList();
+
+        if (jcsjtList.size() > 0){
+            jcsjtList.forEach(list -> {
+                list.setModuleName("项目-监测设计图");
+            });
+            insertFileList(id,jcsjtList);
+        }
+        if (bszbList.size() > 0){
+            bszbList.forEach(list -> {
+                list.setModuleName("项目-布设坐标");
+            });
+            insertFileList(id,bszbList);
+        }
+        if (sygcsjList.size() > 0){
+            sygcsjList.forEach(list -> {
+                list.setModuleName("项目-试油工程设计");
+            });
+            insertFileList(id,sygcsjList);
+        }
+        if (qtList.size() > 0){
+            qtList.forEach(list -> {
+                list.setBusinessId(id);
+                list.setModuleName("项目-其他附件");
+
+            });
+            insertFileList(id,qtList);
+        }
+        //转实体对象
+        WorkXm workXm = new WorkXm();
+        workXm.setId(id);
+        workXm.setCjtjzt("1");
+        workXm.setUpdateBy(SecurityUtils.getUsername());
+        workXm.setUpdateTime(DateUtils.getNowDate());
+        return workXmMapper.updateWorkXm(workXm);
+    }
+    /**
+     * 批量新增附件
+     * @param id
+     * @param list
+     */
+    public void insertFileList(Long id, List<WorkAccessory> list){
+        list.forEach(list1 -> {
+            list1.setBusinessId(id);
+            list1.setCreateBy(SecurityUtils.getUsername());
+            list1.setCreateTime(DateUtils.getNowDate());
+        });
+        workXmcbMapper.insertFile(list);
+    }
 }

qianhe-gzpt/src/main/java/com/qianhe/vo/WorkXmVo.java

@@ -44,6 +44,9 @@ public class WorkXmVo {
     @Excel(name = "提交状态", readConverterExp = "0=未提交,1=已提交")
     private String tjzt;
 
+    /** 采集设计提交状态（0未填报，1已填报，2未提交，3已提交） */
+    private String cjtjzt;
+
     /** 当前节点id */
     private Long dqjdId;
 

qianhe-gzpt/src/main/resources/mapper/WorkXmMapper.xml

@@ -12,6 +12,7 @@
         <result property="tbsj"    column="tbsj"    />
         <result property="lczt"    column="lczt"    />
         <result property="tjzt"    column="tjzt"    />
+        <result property="cjtjzt"    column="cjtjzt"    />
         <result property="dqjdId"    column="dqjd_id"    />
         <result property="dqjdmc"    column="dqjdmc"    />
         <result property="bz"    column="bz"    />
@@ -23,7 +24,7 @@
     </resultMap>
 
     <sql id="selectWorkXmVo">
-        select id, jh, tbr_id, tbr, tbsj, lczt, tjzt, dqjd_id, dqjdmc, bz, create_by, create_time, update_by, update_time, del_flag from work_xm
+        select id, jh, tbr_id, tbr, tbsj, lczt, tjzt, cjtjzt, dqjd_id, dqjdmc, bz, create_by, create_time, update_by, update_time, del_flag from work_xm
     </sql>
 
     <select id="selectWorkXmList" parameterType="WorkXm" resultMap="WorkXmResult">
@@ -36,6 +37,7 @@
             <if test="tbsj != null "> and tbsj = #{tbsj}</if>
             <if test="lczt != null  and lczt != ''"> and lczt = #{lczt}</if>
             <if test="tjzt != null  and tjzt != ''"> and tjzt = #{tjzt}</if>
+            <if test="cjtjzt != null  and cjtjzt != ''"> and cjtjzt = #{cjtjzt}</if>
             <if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
             <if test="dqjdmc != null  and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
         </where>
@@ -52,6 +54,7 @@
             <if test="tbsj != null "> and tbsj = #{tbsj}</if>
             <if test="lczt != null  and lczt != ''"> and lczt = #{lczt}</if>
             <if test="tjzt != null  and tjzt != ''"> and tjzt = #{tjzt}</if>
+            <if test="cjtjzt != null  and cjtjzt != ''"> and cjtjzt = #{cjtjzt}</if>
             <if test="dqjdId != null "> and dqjd_id = #{dqjdId}</if>
             <if test="dqjdmc != null  and dqjdmc != ''"> and dqjdmc = #{dqjdmc}</if>
             <if test="startTime != null and endTime != null">and DATE_FORMAT(tbsj,'%Y-%m-%d') between DATE_FORMAT(#{startTime},'%Y-%m-%d') and DATE_FORMAT(#{endTime},'%Y-%m-%d')</if>
@@ -72,6 +75,7 @@
             <if test="tbsj != null">tbsj,</if>
             <if test="lczt != null">lczt,</if>
             <if test="tjzt != null">tjzt,</if>
+            <if test="cjtjzt != null">cjtjzt,</if>
             <if test="dqjdId != null">dqjd_id,</if>
             <if test="dqjdmc != null">dqjdmc,</if>
             <if test="bz != null">bz,</if>
@@ -86,6 +90,7 @@
             <if test="tbsj != null">#{tbsj},</if>
             <if test="lczt != null">#{lczt},</if>
             <if test="tjzt != null">#{tjzt},</if>
+            <if test="cjtjzt != null">#{cjtjzt},</if>
             <if test="dqjdId != null">#{dqjdId},</if>
             <if test="dqjdmc != null">#{dqjdmc},</if>
             <if test="bz != null">#{bz},</if>
@@ -104,6 +109,7 @@
             <if test="tbsj != null">tbsj = #{tbsj},</if>
             <if test="lczt != null">lczt = #{lczt},</if>
             <if test="tjzt != null">tjzt = #{tjzt},</if>
+            <if test="cjtjzt != null">cjtjzt = #{cjtjzt},</if>
             <if test="dqjdId != null">dqjd_id = #{dqjdId},</if>
             <if test="dqjdmc != null">dqjdmc = #{dqjdmc},</if>
             <if test="bz != null">bz = #{bz},</if>

qianhe-gzpt/src/main/resources/mapper/WorkXmcbMapper.xml

@@ -114,11 +114,11 @@
     </update>
 
     <select id="taskList" resultType="com.qianhe.vo.WorkXmVo">
-        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag
+        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.cjtjzt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag
         FROM work_xm x
         LEFT JOIN work_xmcb w ON w.yltz_id = x.id
         <where>
-            x.del_flag = '0' AND w.del_flag = '0'
+            x.del_flag = '0' AND w.del_flag = '0' and x.tjzt = '1' and cjtjzt = '3'
             <if test="userId != null"> and w.shr_id = #{userId}</if>
             <if test="state != null and state != '' and state == 1"> and w.wczt = #{state} and w.sfsctj = '0'</if>
             <if test="jh != null and jh != ''">and x.jh = #{jh}</if>
@@ -133,7 +133,7 @@
     </select>
 
     <select id="userTaskList" resultType="com.qianhe.vo.WorkXmVo" parameterType="Long">
-        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag, w.id as splsId
+        SELECT x.id, x.jh, x.tbr_id, x.tbr, x.tbsj, x.lczt, x.tjzt, x.cjtjzt, x.dqjd_id, x.dqjdmc, x.create_by, x.create_time, x.update_by, x.update_time, x.del_flag, w.id as splsId
         FROM work_xm x
         LEFT JOIN work_xmcb w ON w.yltz_id = x.id
         where x.del_flag = '0' AND w.del_flag = '0' and w.sfsctj = '0' and w.wczt = '0' and w.shr_id = #{userId}