三单查询新增接口

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPmqManagementDistributionDao.java

@@ -32,7 +32,7 @@ public interface ZhcxPmqManagementDistributionDao extends BaseMapper<ZhcxPmqMana
      * 更新第二层的派单状态
      * @param id id
      */
-    void updateDispatchStatus(@Param("id") String id);
+    void updateDispatchStatus(@Param("id") String id,@Param("nowDate") String nowDate);
 
     /**
      * 根据项目id获取所有的机号

business-common/src/main/java/com/rongwei/bscommon/sys/service/ZhcxPmqManagementDistributionService.java

@@ -27,4 +27,11 @@ public interface ZhcxPmqManagementDistributionService extends IService<ZhcxPmqMa
      * @return 树结构数据
      */
     R selectManifestList(String projectId);
+
+    /**
+     * 构建三单清单数据源(第二层)
+     * @param projectId 项目id
+     * @return 树结构数据
+     */
+    R selectManifestList2(String projectId, String id);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementDistributionServiceImpl.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -111,7 +112,8 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
         // 可能会涉及到改派 TODO 未写完
         // dispatchTochange(pid,detailIds);
         // 更新第二层的派单状态
-        baseMapper.updateDispatchStatus(pid);
+        String nowDate = DateUtil.formatDateTime(new Date());
+        baseMapper.updateDispatchStatus(pid,nowDate);
         return R.ok("派单成功");
     }
 
@@ -182,4 +184,16 @@ public class ZhcxPmqManagementDistributionServiceImpl extends ServiceImpl<ZhcxPm
         // 返回结果集
         return R.ok(resultList);
     }
+
+    @Override
+    public R selectManifestList2(String projectId, String id) {
+        // 构建第二层数据
+        List<ZhcxPmqManageChildVo> childList = baseMapper.getAllDeptByPid(id);
+        for (ZhcxPmqManageChildVo zhcxPmqManageChildVo : childList) {
+            // 构造第三层数据
+            List<MachineState> machines = baseMapper.getMachinesStatus(projectId,zhcxPmqManageChildVo.getId());
+            zhcxPmqManageChildVo.setMachines(machines);
+        }
+        return R.ok(childList);
+    }
 }

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementDistributionDao.xml

@@ -6,7 +6,7 @@
         UPDATE
             INCONTROL.ZHCX_PMQ_MANAGEMENT_RECORED
         SET
-            DISPATCHSTATUS = '1'
+            DISPATCHSTATUS = '1',MODIFYDATE = #{nowDate}
         WHERE
             ID = #{id}
     </update>

business-server/src/main/java/com/rongwei/bsserver/controller/ZhcxPMQMController.java

@@ -96,4 +96,18 @@ public class ZhcxPMQMController {
             return R.error("三单清单数据源异常");
         }
     }
+
+    @GetMapping("/selectManifestList2")
+    @ApiOperation("三单清单数据源")
+    public R selectManifestList2(String projectId,String id){
+        try {
+            if(Objects.isNull(projectId)){return R.ok("项目id为空");}
+            if(Objects.isNull(id)){return R.ok("id为空");}
+            log.info("三单清单数据源__>项目id:{}",projectId);
+            return pmqManagementDistributionService.selectManifestList2(projectId,id);
+        } catch (Exception e) {
+            log.info(String.valueOf(e));
+            return R.error("三单清单数据源异常");
+        }
+    }
 }