检验分配逻辑变更

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -431,7 +431,7 @@ public class OpenServiceImpl implements OpenService {
         List<QcUserMaterialDTO> users = openMapper.getCheckUserBelongLine(qcCheckTaskProduce);
         if (CollectionUtils.isEmpty(users)) {
             users = openMapper.getCheckUsers(qcCheckTaskProduce.getCheckType());
-        } else {
+        }
             for (QcUserMaterialDTO user : users) {
                 user.setId(IdUtils.fastSimpleUUID());
                 user.setBelongTo(beLongId);
@@ -440,7 +440,6 @@ public class OpenServiceImpl implements OpenService {
                 user.setFactoryCode(factoryCode);
                 user.setCreateTime(nowDate);
             }
-        }
         /**qc_check_task_user**/
         int m = openMapper.addCheckUsers(users);
         logger.info(qcCheckTaskProduce.getOrderNo()+":检查人新增" + m + "成功");

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -239,16 +239,16 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			users = qcCheckTaskIncomeMapper.getCheckUserBelongStandar(qcCheckTaskIncome);
 			if(CollectionUtils.isEmpty(users)){
 				users = qcCheckTaskIncomeMapper.getCheckUser(qcCheckTaskIncome);
-			}else{
-				for(QcUserMaterialDTO user:users){
-					user.setId(IdUtils.fastSimpleUUID());
-					user.setBelongTo(beLongId);
-					user.setCheckNo(qcCheckTaskIncome.getCheckNo());
-					user.setCreateBy(createBy);
-					user.setFactoryCode(factoryCode);
-					user.setCreateTime(nowDate);
-				}
 			}
+			for(QcUserMaterialDTO user:users){
+				user.setId(IdUtils.fastSimpleUUID());
+				user.setBelongTo(beLongId);
+				user.setCheckNo(qcCheckTaskIncome.getCheckNo());
+				user.setCreateBy(createBy);
+				user.setFactoryCode(factoryCode);
+				user.setCreateTime(nowDate);
+			}
+
 			int m=qcCheckTaskIncomeMapper.addCheckUsers(users);
 			logger.info("检查人新增"+m+"成功");
 		}

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcInterfaceServiceImpl.java

@@ -128,7 +128,7 @@ public class QcInterfaceServiceImpl implements IQcInterfaceService {
         qcInterface.setYmd(nowYMD);
         List<QcInterface> dtos = qcInterfaceMapper.getSupplierTaskList(qcInterface);
         for (QcInterface dto : dtos) {
-            String[] ymdArray = dto.getIncomeTime().split("-");
+            String[] ymdArray = dto.getIncomeTime().split(" ")[0].split("-");
             LocalDate date1 = LocalDate.of(Integer.parseInt(ymdArray[0]),
                     Integer.parseInt(ymdArray[1]),
                     Integer.parseInt(ymdArray[2]));

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcStaticTableServiceImpl.java

@@ -1779,7 +1779,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
         Map<String,String> dto2= new HashMap<>();
         dto2.put("dataType","不良比例");
         Map<String,String> dto3 = new HashMap<>();
-        dto3.put("dataType","累计不良率");
+        dto3.put("dataType","累计不良比例");
         for(int i=0;i<bpDefects.size();i++){
             String defectName = bpDefects.get(i);
             QcStaticTable sampMap = defectMaps.get(defectName);
@@ -1892,7 +1892,7 @@ public class QcStaticTableServiceImpl implements IQcStaticTableService {
         Map<String,String> dto2= new HashMap<>();
         dto2.put("dataType","不良比例");
         Map<String,String> dto3 = new HashMap<>();
-        dto3.put("dataType","累计不良率");
+        dto3.put("dataType","累计不良比例");
         for(int i=0;i<bpDefects.size();i++){
             String defectName = bpDefects.get(i);
             QcStaticTable sampMap = defectMaps.get(defectName);

op-modules/op-quality/src/main/resources/mapper/quality/QcInterfaceMapper.xml

@@ -172,7 +172,7 @@
         qct.quality,
         qct.unit,
         qct.supplier_name supplierName,
-        CONVERT(varchar(10),qct.income_time, 120) incomeTime,
+        CONVERT(varchar(30),qct.income_time, 120) incomeTime,
         qct.check_status checkStatus,
         qct.check_result checkResult,
         qct.check_man_name checkManName,