检验任务，图片地址增加，不良类型描述修改

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskIncome.java

@@ -216,6 +216,38 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String oaFactoryF;//异常范围
     private String sccj;
     private String bz;
+    /**
+     * 	cxzz:产线组长签名路径，(首检)
+     * 	jgy:机管员签名路径，(首检)
+     * 	pgy:品管员签名路径(首检)
+     */
+    private String cxzz;
+    private String jgy;
+    private String pgy;
+
+    public String getCxzz() {
+        return cxzz;
+    }
+
+    public void setCxzz(String cxzz) {
+        this.cxzz = cxzz;
+    }
+
+    public String getJgy() {
+        return jgy;
+    }
+
+    public void setJgy(String jgy) {
+        this.jgy = jgy;
+    }
+
+    public String getPgy() {
+        return pgy;
+    }
+
+    public void setPgy(String pgy) {
+        this.pgy = pgy;
+    }
 
     public String getBz() {
         return bz;

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

@@ -1,6 +1,7 @@
 package com.op.quality.service.impl;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.regex.Matcher;
@@ -852,6 +853,9 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
 		qcCheckTask.setReason(qcCheckTaskIncome.getReason());
 		qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注
+		qcCheckTask.setCxzz(qcCheckTaskIncome.getCxzz());
+		qcCheckTask.setJgy(qcCheckTaskIncome.getJgy());
+		qcCheckTask.setPgy(qcCheckTaskIncome.getPgy());
 
 		BigDecimal sampleQuality = new BigDecimal("0");
 		for(QcCheckTaskDetail detail:details){

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

@@ -315,6 +315,9 @@
         <if test="remark != null">remark = #{remark},</if>
         <if test="reason != null">reason = #{reason},</if>
         <if test="bz != null">bz = #{bz},</if>
+        <if test="cxzz != null">cxzz = #{cxzz},</if>
+        <if test="jgy != null">jgy = #{jgy},</if>
+        <if test="pgy != null">pgy = #{pgy},</if>
         check_result = #{checkResult},
         update_by = #{updateBy},
         update_time = #{updateTime}
@@ -588,7 +591,10 @@
 			qct.check_result checkResult,
 			qct.income_time incomeTime,
 			qct.check_loc checkLoc,
-		    qct.remark
+		    qct.remark,
+            qct.cxzz,
+            qct.jgy,
+            qct.pgy
 		from qc_check_task qct
 		left join pro_order_workorder pow on pow.workorder_code = qct.order_no and pow.del_flag = '0'
 		where qct.record_id = #{recordId}

op-modules/op-wms/src/main/java/com/op/wms/controller/BaseDictDataController.java

@@ -44,6 +44,12 @@ public class BaseDictDataController extends BaseController {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
     }
+    @GetMapping("/getDictData")
+    @DS("#header.poolName")
+    public AjaxResult getDict(SysDictData dictData) {
+        List<SysDictData> list = dictDataService.getDictDataList(dictData);
+        return success(list);
+    }
 
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @RequiresPermissions("factory:dict:export")

op-modules/op-wms/src/main/java/com/op/wms/mapper/BaseDictDataMapper.java

@@ -92,4 +92,6 @@ public interface BaseDictDataMapper {
      * @return 结果
      */
     public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
+
+    List<SysDictData> getDictDataList(SysDictData dictData);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBaseDictDataService.java

@@ -58,4 +58,6 @@ public interface IBaseDictDataService {
      * @return 结果
      */
     public int updateDictData(SysDictData dictData);
+
+    List<SysDictData> getDictDataList(SysDictData dictData);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseDictDataServiceImpl.java

@@ -30,6 +30,11 @@ public class BaseDictDataServiceImpl implements IBaseDictDataService {
         return dictDataMapper.selectDictDataList(dictData);
     }
 
+    @Override
+    public List<SysDictData> getDictDataList(SysDictData dictData) {
+        return dictDataMapper.getDictDataList(dictData);
+    }
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *

op-modules/op-wms/src/main/resources/mapper/wms/BaseDictDataMapper.xml

@@ -41,6 +41,37 @@
         order by dict_sort asc
     </select>
 
+    <select id="getDictDataList" parameterType="SysDictType" resultMap="SysDictTypeResult">
+        select
+            CONCAT(dict_label,'[',dict_value,']') AS dict_label,
+            dict_code,
+            dict_sort,
+            dict_value,
+            dict_type,
+            status,
+            remark
+        from base_dict_data
+        <where>
+            <if test="dictType != null and dictType != ''">
+                AND dict_type = #{dictType}
+            </if>
+            <if test="dictLabel != null and dictLabel != ''">
+                AND dict_label like concat('%', #{dictLabel}, '%')
+            </if>
+            <if test="dictValue != null and dictValue != ''">
+                AND dict_value = #{dictValue}
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="remark != null and remark != ''">
+                AND remark like concat('%', #{remark}, '%')
+            </if>
+        </where>
+        order by dict_sort asc
+
+    </select>
+
     <select id="selectDictDataByType" parameterType="SysDictType" resultMap="SysDictTypeResult">
         <include refid="selectDictDataVo"/>
         where status = '0' and dict_type = #{dictType} order by dict_sort asc