部件图号弹优化

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

@@ -15,10 +15,10 @@ 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 REPLACE(UUID(), '-', '') as ID,t.ID as PARTNOID,t.DTDRAWINGNO,t.DTPARTNAME,t.DTSERIALID,l.DLPROJID,l.DLPROJNAME from t_design_task t\n" +
+    @Select("select REPLACE(UUID(), '-', '') as ID,'0' as DELETED,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);
+            "where t.DELETED='0' and IFNULL(t.DTDRAWINGNO,'')!='' and IFNULL(t.DTPARTNAME,'')!='' and t.DTSERIALID=#{dtserialId} ${searStr} order by t.DTDRAWINGNO")
+    List<QcsPartNoDo> getPartnos(@Param("dtserialId") String dtserialId, @Param("searStr") String searStr);
 
     @Select("select 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" +

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

@@ -13,5 +13,5 @@ public interface CommonService {
 
     R getMdfFormInfo(String dtwhoapproveTime) throws Exception;
 
-    IPage<Map<String, Object>> getPartno(@RequestBody CriteriaQuery query, String dtserialId);
+    IPage<Map<String, Object>> getPartno(String dtserialId, String dtdrawingno, String dtpartname) throws Exception;
 }

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

@@ -7,6 +7,7 @@ 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.bscommon.sys.utils.StringUtil;
 import com.rongwei.bsentity.domain.*;
 import com.rongwei.bsentity.vo.QcsMdfFormVo;
 import com.rongwei.bsentity.vo.QcsMdfRowVo;
@@ -150,18 +151,28 @@ public class CommonServiceImpl implements CommonService {
     }
 
     @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);
+    public IPage<Map<String, Object>> getPartno(String dtserialId, String dtdrawingno, String dtpartname) throws Exception {
+        String searStr = "";
+        if (StringUtils.isNotBlank(dtdrawingno)) {
+            searStr = " and t.DTDRAWINGNO like '%" + dtdrawingno + "%'";
         }
-
-        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());
+        if (StringUtils.isNotBlank(dtpartname)) {
+            searStr += " and t.DTPARTNAME like '" + dtpartname + "'";
+        }
+//        log.info("获取获取部件图号开始");
+        List<QcsPartNoDo> qcsPartNoDos = slaveDao.getPartnos(dtserialId, searStr);
+        Page ipe = new Page();
+        ipe.setRecords(StringUtil.convertToUpperFieldMap(qcsPartNoDos));
+//        log.info("获取部件图号返回");
         return ipe;
     }
+
+//    private void savePartNos(String dtserialId) {
+//        //先清空再新增
+//        qcsMdfFormDao.deleteAll();
+//        List<QcsPartNoDo> qcsPartNoDoList = slaveDao.getPartnos(dtserialId);
+//        if (qcsPartNoDoList.size() > 0) {
+//            qcsPartNoService.saveBatch(qcsPartNoDoList);
+//        }
+//    }
 }

qcs-common/src/main/java/com/rongwei/bscommon/sys/utils/StringUtil.java

@@ -3,8 +3,8 @@ package com.rongwei.bscommon.sys.utils;
 import org.apache.commons.lang3.BooleanUtils;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.UUID;
+import java.lang.reflect.Field;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -351,4 +351,19 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils {
         return input.matches(".*[" + regex + "].*");
     }
 
+    //字段转大写
+    public static List<Map<String, Object>> convertToUpperFieldMap(List<?> originalList) throws Exception {
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Object obj : originalList) {
+            Map<String, Object> map = new HashMap<>();
+            Class<?> clazz = obj.getClass();
+            for (Field field : clazz.getDeclaredFields()) {
+                field.setAccessible(true);
+                map.put(field.getName().toUpperCase(), field.get(obj));
+            }
+            result.add(map);
+        }
+        return result;
+    }
+
 }

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

@@ -28,9 +28,9 @@ public class CommonController {
 
     //获取部件图号
     @RequestMapping("/getPartno")
-    public R getPartno(@RequestBody CriteriaQuery query, String dtserialId) {
+    public R getPartno(String dtserialId, String dtdrawingno, String dtpartname) {
         try {
-            IPage<Map<String, Object>> result = commonService.getPartno(query, dtserialId);
+            IPage<Map<String, Object>> result = commonService.getPartno(dtserialId, dtdrawingno, dtpartname);
             return R.ok(result);
         } catch (Exception e) {
             e.printStackTrace();