三单对外API

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

@@ -3,6 +3,7 @@ package com.rongwei.bscommon.sys.dao;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDetailDo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementDistributionDetailVo;
+import com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,4 +47,7 @@ public interface ZhcxPmqManagementDistributionDetailDao extends BaseMapper<ZhcxP
      * @return
      */
     List<ZhcxPmqManagementDistributionDetailVo> getDataByTime(@Param("data") String data);
+
+
+    List<ZhcxPmqManagementVo> getDataForApi(@Param("seqno") String seqno, @Param("dept") String dept);
 }

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

@@ -54,4 +54,12 @@ public interface ZhcxPmqManagementDistributionDetailService extends IService<Zhc
      * @return
      */
     R updateDetailStatus(Map<String, Object> map);
+
+    /**
+     * 三单对外接口
+     * @param seqno 流水号
+     * @param dept 部门编号(NX系统的)
+     * @return
+     */
+    R getDataForApi(String seqno, String dept);
 }

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

@@ -8,6 +8,7 @@ import com.rongwei.bsentity.domain.ZhcxPmqManagementDistributionDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementDo;
 import com.rongwei.bsentity.domain.ZhcxPmqManagementRecoredDo;
 import com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementDistributionDetailVo;
+import com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementVo;
 import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -169,4 +170,14 @@ public class ZhcxPmqManagementDistributionDetailServiceImpl extends ServiceImpl<
         // 更新关闭状态
         return this.updateClosedStateInThirdFloor(id);
     }
+
+    @Override
+    public R getDataForApi(String seqno, String dept) {
+        List<ZhcxPmqManagementVo> list = baseMapper.getDataForApi(seqno,dept);
+        if(list.isEmpty()){
+            return R.ok("暂无数据");
+        }else {
+            return R.ok(list);
+        }
+    }
 }

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

@@ -121,4 +121,44 @@ ORDER BY
             x.DELETED = '0' AND TRUNC(r.DISTRIBUTETIME) = TO_DATE(#{data}, 'YYYY-MM-DD') AND (x.STATUS IS NOT NULL OR x.STATUS !='未关闭')
         GROUP BY x.MACHINEID,x.SERIALNUMBER,r.DEPTID
     </select>
+
+    <select id="getDataForApi" resultType="com.rongwei.bsentity.vo.pmq.ZhcxPmqManagementVo">
+        SELECT
+            p.MACHINENO AS MACHINENO,
+            manage.PROJECTNO AS PROJECTNO,
+            manage.PROJECTNAME AS PROJECTNAME,
+            dis.CONFIRMERID AS CONFIRMERID,
+            dis.CONFIRMER AS CONFIRMER,
+            dis.ESTIMATEDCLOSEDATA AS ESTIMATEDCLOSEDATA,
+            COALESCE (IF(dis.STATUS IS NULL, recored.CLOSESTATUS, dis.STATUS),recored.CLOSESTATUS)  AS STATUS,
+            recored.SEQNO AS SERIALNUMBER,
+            recored.REMARK AS REMARK,
+            dis.SUPPLEMENT AS SUPPLEMENT,
+            recored.DEPTNAME,
+            recored.DEPTID,
+            dis.CLOSEDATA,
+            recored.DISTRIBUTETIME
+        FROM
+            ZHCX_PMQ_MANAGEMENT_RECORED recored
+                LEFT JOIN ZHCX_PMQ_MANAGEMENT manage ON manage.ID = recored.PMQMID AND manage.DELETED = '0'
+                LEFT JOIN (
+                SELECT
+                    n.ID AS MACHINEID,
+                    n.DEVICE_NUMBER AS MACHINENO,
+                    p.ID AS PROJECTID
+                FROM
+                    ZHCX_PROJECT_DEVICE_NUMBER n
+                        JOIN ZHCX_PROJECT_MANAGE p ON
+                        p.ID = n.PID
+                            AND p.DELETED = '0'
+                WHERE
+                    n.DELETED = '0'
+            )p ON p.PROJECTID = manage.PROJECTID
+                LEFT JOIN ZHCX_PMQ_MANAGEMENT_DISTRIBUTION_DETAIL dis ON dis.PID = recored.ID AND dis.MACHINEID = p.MACHINEID AND dis.DELETED = '0'
+        WHERE
+            recored.DELETED = '0' AND
+            recored.SEQNO = #{seqno} and recored.DEPTID = #{dept}
+        ORDER BY
+            TO_NUMBER(REPLACE(p.MACHINENO, '#', '')),dis.REMARK
+    </select>
 </mapper>

business-entity/src/main/java/com/rongwei/bsentity/vo/pmq/ZhcxPmqManagementVo.java

@@ -0,0 +1,101 @@
+package com.rongwei.bsentity.vo.pmq;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ZhcxPmqManagementVo {
+    /**
+     * 机号
+     */
+    @TableField("MACHINENO")
+    private String machineno;
+
+    /**
+     * 项目工号
+     */
+    @TableField("PROJECTNO")
+    private String projectno;
+
+    /**
+     * 项目名称
+     */
+    @TableField("PROJECTNAME")
+    private String projectname;
+
+    /**
+     * 质检确认人
+     */
+    @TableField("CONFIRMERID")
+    private String confirmerid;
+
+    /**
+     * 质检确认人
+     */
+    @TableField("CONFIRMER")
+    private String confirmer;
+
+    /**
+     * 预计关闭日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("ESTIMATEDCLOSEDATA")
+    private Date estimatedclosedata;
+
+    /**
+     * 状态
+     */
+    @TableField("STATUS")
+    private String status;
+
+    /**
+     * 流水号
+     */
+    @TableField("SERIALNUMBER")
+    private String serialnumber;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 补充项
+     */
+    @TableField("SUPPLEMENT")
+    private String supplement;
+    /**
+     * 下发时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("DISTRIBUTETIME")
+    private Date distributetime;
+
+    /**
+     * 部门ID
+     */
+    @TableField("DEPTID")
+    private String deptid;
+    /**
+     * 部门
+     */
+    @TableField("DEPTNAME")
+    private String deptname;
+
+    /**
+     * 关闭日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @TableField("CLOSEDATA")
+    private Date closedata;
+
+
+}

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

@@ -108,9 +108,9 @@ public class ZhcxPmqManagementController {
     }
 
     @PostMapping("/getData")
-    @ApiOperation("三单页面数据回传")
+    @ApiOperation("三单页面数据回传(三单对外接口)")
     public R getData(@RequestBody Map<String,Object> map){
-        try {
+        /*try {
             if(Objects.isNull(map.get("data"))){
                 return R.error("日期不能为空");
             }
@@ -119,7 +119,15 @@ public class ZhcxPmqManagementController {
         } catch (Exception e) {
             log.info(String.valueOf(e));
             return R.error("三单页面数据回传异常");
+        }*/
+        if(Objects.isNull(map.get("seqno"))){
+            return R.error("流水号不能为空");
+        }
+        if(Objects.isNull(map.get("dept"))){
+            return R.error("部门编号不能为空");
         }
+        log.info("三单页面数据回传->流水号是:{};->部门编号是:{}",map.get("seqno"),map.get("dept"));
+        return distributionDetailService.getDataForApi((String)map.get("seqno"),(String)map.get("dept"));
     }
 
     /**