部件图号弹窗

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsMdfFormDao.java

@@ -1,13 +1,23 @@
 package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rongwei.bsentity.domain.QcsMdfFormDo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface QcsMdfFormDao extends BaseMapper<QcsMdfFormDo> {
     @Select("select ID from qcs_mdf_form where DELETED='0' and DTWHOAPPROVETIME>='${dtwhoapproveTime} 00:00:00' and DTWHOAPPROVETIME<='${dtwhoapproveTime} 23:59:59'")
     List<QcsMdfFormDo> getQcsMdfForms(@Param("dtwhoapproveTime") String dtwhoapproveTime);
+
+    @Delete("delete from qcs_part_no ")
+    void deleteAll();
+
+    @Select("${querysql}")
+    IPage<Map<String, Object>> queryPageDataFromSql(Page page, @Param("querysql") String querysql);
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/QcsPartNoDao.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QcsPartNoDo;
+import com.rongwei.rwcommon.base.BaseDao;
+
+public interface QcsPartNoDao extends BaseDao<QcsPartNoDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/dao/SlaveDao.java

@@ -1,7 +1,9 @@
 package com.rongwei.bscommon.sys.dao;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.rongwei.bsentity.domain.QcsPartNoDo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -13,6 +15,8 @@ public interface SlaveDao {
     @Select("SELECT DLSERIALID,DLPROJID,DLPROJNAME FROM t_drawing_list where DELETED='0' and IFNULL(DLPROJID,'')!='' and IFNULL(DLPROJNAME,'')!='' order by DLPROJID")
     List<Map<String, Object>> getProjectCode();
 
-    @Select("select ID,DTDRAWINGNO,DTPARTNAME,DTSERIALID from t_design_task where DELETED='0' and IFNULL(DTDRAWINGNO,'')!='' and IFNULL(DTPARTNAME,'')!='' order by DTDRAWINGNO")
-    List<Map<String, Object>> getPartnos();
+    @Select("select REPLACE(UUID(), '-', '') as ID,t.ID as PARTNOID,t.DTDRAWINGNO,t.DTPARTNAME,t.DTSERIALID,l.DLPROJID,l.DLPROJNAME from t_design_task t\n" +
+            "left join t_drawing_list l on l.DLSERIALID=t.DTSERIALID\n" +
+            "where t.DELETED='0' and IFNULL(t.DTDRAWINGNO,'')!='' and IFNULL(t.DTPARTNAME,'')!='' and t.DTSERIALID=#{dtserialId} order by t.DTDRAWINGNO")
+    List<QcsPartNoDo> getPartnos(@Param("dtserialId") String dtserialId);
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/CommonService.java

@@ -1,12 +1,17 @@
 package com.rongwei.bscommon.sys.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.vo.CriteriaQuery;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
 
 public interface CommonService {
 
     R getProjectCode();
 
-    R getPartno();
-
     R getMdfFormInfo(String dtwhoapproveTime) throws Exception;
+
+    IPage<Map<String, Object>> getPartno(@RequestBody CriteriaQuery query, String dtserialId);
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/QcsPartNoService.java

@@ -0,0 +1,7 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QcsPartNoDo;
+
+public interface QcsPartNoService extends IService<QcsPartNoDo> {
+}

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/CommonServiceImpl.java

@@ -1,23 +1,24 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.rongwei.bscommon.sys.dao.QcsMdfFormDao;
 import com.rongwei.bscommon.sys.dao.SlaveDao;
 import com.rongwei.bscommon.sys.service.*;
 import com.rongwei.bscommon.sys.utils.MdfApi;
-import com.rongwei.bsentity.domain.QcsMdfFileDo;
-import com.rongwei.bsentity.domain.QcsMdfFormDo;
-import com.rongwei.bsentity.domain.QcsMdfRowDo;
-import com.rongwei.bsentity.domain.QcsMdfSectionDo;
+import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.QcsMdfFormVo;
 import com.rongwei.bsentity.vo.QcsMdfRowVo;
 import com.rongwei.bsentity.vo.QcsMdfSectionVo;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.vo.CriteriaQuery;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -42,6 +43,8 @@ public class CommonServiceImpl implements CommonService {
     private QcsMdfFileService qcsMdfFileService;
     @Autowired
     private QcsMdfFormDao qcsMdfFormDao;
+    @Autowired
+    private QcsPartNoService qcsPartNoService;
 
     @Autowired
     SlaveDao slaveDao;
@@ -61,21 +64,6 @@ public class CommonServiceImpl implements CommonService {
         return r;
     }
 
-    @Override
-    public R getPartno() {
-        R r = new R();
-        try {
-            List<Map<String, Object>> partMap = slaveDao.getPartnos();
-            r.setCode("200");
-            r.setData(partMap);
-        } catch (Exception e) {
-            e.printStackTrace();
-            r.setCode("500");
-            log.info("获取部件图号失败：" + e.getMessage());
-        }
-        return r;
-    }
-
     //获取修改单信息
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -148,4 +136,20 @@ public class CommonServiceImpl implements CommonService {
         r.setMsg(mdfmap.get("msg").toString());
         return r;
     }
+
+    @Override
+    public IPage<Map<String, Object>> getPartno(@RequestBody CriteriaQuery query, String dtserialId) {
+        //先清空再新增
+        qcsMdfFormDao.deleteAll();
+        List<QcsPartNoDo> qcsPartNoDoList = slaveDao.getPartnos(dtserialId);
+        if (qcsPartNoDoList.size() > 0) {
+            qcsPartNoService.saveBatch(qcsPartNoDoList);
+        }
+
+        Page page = new Page();
+        page.setCurrent(query.getCurrent() == null ? 1 : query.getCurrent());
+        page.setSize(query.getSize() == null ? Long.MAX_VALUE : query.getSize());
+        IPage<Map<String, Object>> ipe = qcsMdfFormDao.queryPageDataFromSql(page, query.getQuerySql());
+        return ipe;
+    }
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QcsPartNoImpl.java

@@ -0,0 +1,11 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QcsPartNoDao;
+import com.rongwei.bscommon.sys.service.QcsPartNoService;
+import com.rongwei.bsentity.domain.QcsPartNoDo;
+import org.springframework.stereotype.Service;
+
+@Service
+public class QcsPartNoImpl extends ServiceImpl<QcsPartNoDao, QcsPartNoDo> implements QcsPartNoService {
+}

qcs-entity/src/main/java/com/rongwei/bsentity/domain/QcsPartNoDo.java

@@ -0,0 +1,51 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("qcs_part_no")
+public class QcsPartNoDo extends BaseDo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 部件图号ID
+     */
+    private String partnoid;
+
+    /**
+     * 部件图号
+     */
+    private String dtdrawingno;
+
+    /**
+     * 部件名称
+     */
+    private String dtpartname;
+
+    /**
+     * 项目工号ID
+     */
+    private String dtserialid;
+
+    /**
+     * 项目工号
+     */
+    private String dlprojid;
+
+    /**
+     * 项目名称
+     */
+    private String dlprojname;
+}

qcs-server/src/main/java/com/rongwei/controller/CommonController.java

@@ -1,13 +1,18 @@
 package com.rongwei.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.rongwei.bscommon.sys.service.CommonService;
 import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.vo.CriteriaQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 @Slf4j
 @RestController
 @RequestMapping("/common")
@@ -22,9 +27,15 @@ public class CommonController {
     }
 
     //获取部件图号
-    @PostMapping("/getPartno")
-    public R getPartno() {
-        return commonService.getPartno();
+    @RequestMapping("/getPartno")
+    public R getPartno(@RequestBody CriteriaQuery query, String dtserialId) {
+        try {
+            IPage<Map<String, Object>> result = commonService.getPartno(query, dtserialId);
+            return R.ok(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("获取部件图号异常");
+        }
     }
 
     //获取修改单信息