bug修复

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -116,12 +116,12 @@
                 #{workorderName}, '%')
             </if>
             <if test="orderId != null  and orderId != ''">and pow.order_id = #{orderId}</if>
-            <if test="orderCode != null  and orderCode != ''">and pow.order_code like concat('%', #{orderCode}, '%')</if>
+            <if test="orderCode != null  and orderCode != ''">and pow.workorder_code_sap like concat('%', #{orderCode}, '%')</if>
             <if test="productCode != null  and productCode != ''">
-                and ppow.product_code like concat('%', #{productCode},'%')
+                and pow.product_code like concat('%', #{productCode},'%')
             </if>
             <if test="productName != null  and productName != ''">
-                and ppow.product_name like concat('%', #{productName},'%')
+                and pow.product_name like concat('%', #{productName},'%')
             </if>
             <if test="productDate != null ">and pow.product_date = #{productDate}</if>
             <if test="shiftId != null  and shiftId != ''">and pow.shift_id = #{shiftId}</if>

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskIncomeMapper.java

@@ -90,6 +90,8 @@ public interface QcCheckTaskIncomeMapper {
 
     List<QcUserMaterialDTO> getUserByCheckType(String checkType);
 
+    List<QcUserMaterialDTO> getCheckUser(QcCheckTaskIncome qcCheckTaskIncome);
+
     int addCheckUsers(@Param("list") List<QcUserMaterialDTO> users);
 
     int addQcCheckTaskDefects(@Param("list") List<QcCheckTaskDefect> defects);

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

@@ -220,7 +220,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			qcCheckTaskIncome.setCheckManName("");
 			qcCheckTaskIncome.setCheckManCode("");
 			/**qc_user_material取默认检查人**/
-			List<QcUserMaterialDTO> users = qcCheckTaskIncomeMapper.getUserByCheckType(qcCheckTaskIncome.getCheckType());
+			List<QcUserMaterialDTO> users = qcCheckTaskIncomeMapper.getCheckUser(qcCheckTaskIncome);
 			if(CollectionUtils.isEmpty(users)){
 				QcUserMaterialDTO dto0 = new QcUserMaterialDTO();
 				dto0.setId(IdUtils.fastSimpleUUID());

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

@@ -351,6 +351,16 @@
         where material_code = #{checkType} and del_flag = '0'
     </select>
 
+    <select id="getCheckUser" resultType="com.op.system.api.domain.quality.QcUserMaterialDTO">
+        select user_code userCode,
+               user_name userName
+        from qc_user_material
+        where material_code = #{checkType} and del_flag = '0'
+          <if test = "orderType!=null">
+             and attr1 = #{orderType}
+          </if>
+    </select>
+
     <select id="getCkeckDefectList" resultType="com.op.quality.domain.QcCheckTaskDefect">
 		select
 			qctd.defect_code defectCode,

op-modules/op-system/src/main/java/com/op/system/service/impl/SysDatasourceServiceImpl.java

@@ -102,6 +102,11 @@ public class SysDatasourceServiceImpl implements ISysDatasourceService {
         //修改之后status->1 不生效，需要重新测试链接才生效
         sysDatasource.setStatus("1");
         sysDatasource.setUpdateTime(DateUtils.getNowDate());
+        if (StringUtils.isNotEmpty(sysDatasource.getIpPort())) {
+            sysDatasource.setUrl(mysqlPrev + sysDatasource.getIpPort().split("/")[0]
+                    + mysqlAffter + sysDatasource.getIpPort().split("/")[1]);
+        }
+
         return sysDatasourceMapper.updateSysDatasource(sysDatasource);
     }