modify:增加执行人查询

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -1063,6 +1063,10 @@ public class ChangeFlowBiz {
     public ChangeFlowListVO query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
         log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize,
                 JSON.toJSONString(changeFlowListQueryReq));
+        if (StringUtils.isNotBlank(changeFlowListQueryReq.getChangeExecUser())) {
+            List<Long> recordIds = changeFlowExecService.queryByExecUser(changeFlowListQueryReq.getChangeExecUser());
+            changeFlowListQueryReq.setChangeRecordIds(recordIds);
+        }
         //进行分页
         PageHelper.startPage(page, pageSize);
         PageInfo<ChangeRecord> changeRecordPageInfo = new PageInfo<>(

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/ChangeFlowExecService.java

@@ -36,4 +36,11 @@ public interface ChangeFlowExecService {
     Integer deleteByChangeRecordId(Long id);
 
     void saveRecord(ChangeExecRecord exec);
+
+    /**
+     * 查询包含执行人的工单
+     * @param changeExecUser
+     * @return
+     */
+    List<Long> queryByExecUser(String changeExecUser);
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowExecServiceImpl.java

@@ -64,4 +64,9 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
     public void saveRecord(ChangeExecRecord exec) {
         changeExecRecordMapper.insertSelective(exec);
     }
-}
+
\ No newline at end of file
+    @Override
+    public List<Long> queryByExecUser(String changeExecUser) {
+        return changeExecRecordMapper.queryByUser("%" + changeExecUser + "%");
+    }
+}

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeExecRecordMapper.java

@@ -36,4 +36,7 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper<
 
     @Delete("delete from TB_YX_QC_CHANGE_EXEC_RECORD where change_record_id = #{changeRecordId}")
     Integer deleteByBaseId(@Param("changeRecordId") Long changeRecordId);
+
+    @Select("SELECT DISTINCT(change_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE change_exec_user_email LIKE #{changeExecUser}")
+    List<Long> queryByUser(@Param("changeExecUser") String changeExecUser);
 }

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowListQueryReq.java

@@ -10,6 +10,8 @@ import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @Author zcwang
  * @Date 2022/11/21
@@ -21,6 +23,8 @@ public class ChangeFlowListQueryReq {
      */
     private String itemId;
 
+    private String skuId;
+
     /**
      * 变更供应商（变更主体为供应商时有效）
      */
@@ -78,6 +82,16 @@ public class ChangeFlowListQueryReq {
     private String createSupplier;
 
     /**
+     * 变更执行人
+     */
+    private String changeExecUser;
+
+    /**
+     * 变更记录id集合
+     */
+    private List<Long> changeRecordIds;
+
+    /**
      * 工单id
      */
     private Long flowId;

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeRecordMapper.xml

@@ -13,6 +13,7 @@
         <result column="change_department" jdbcType="VARCHAR" property="changeDepartment" />
         <result column="participate_change_exec_department" jdbcType="VARCHAR" property="participateChangeExecDepartment" />
         <result column="change_item" jdbcType="VARCHAR" property="changeItem" />
+        <result column="change_sku" jdbcType="VARCHAR" property="changeSku" />
         <result column="change_supplier" jdbcType="VARCHAR" property="changeSupplier" />
         <result column="change_reason" jdbcType="VARCHAR" property="changeReason" />
         <result column="change_content" jdbcType="VARCHAR" property="changeContent" />
@@ -35,7 +36,7 @@
     <sql id="Base_Column_List">
         id, flow_id, flow_node, change_subject, parent_change_class_id, son_change_class_id,
     change_level, change_commander, change_department, participate_change_exec_department,
-    change_item, change_supplier, change_reason, change_content, change_risk_desc, change_checking,
+    change_item, change_sku, change_supplier, change_reason, change_content, change_risk_desc, change_checking,
     change_profit, change_profit_desc, change_confirm_result_time, `state`, cancel_reason,
     change_result, create_source, create_supplier, change_result_desc, remark, creator,
     create_time, update_time
@@ -51,6 +52,9 @@
             <if test="itemId != null ">
                 and change_item like concat('%',#{itemId},'%')
             </if>
+            <if test="skuId != null ">
+                and change_sku like concat('%',#{skuId},'%')
+            </if>
             <if test="supplier != null ">
                 and change_supplier = #{supplier}
             </if>
@@ -84,6 +88,12 @@
             <if test="flowId != null">
                 and flow_id = #{flowId}
             </if>
+            <if test="changeRecordIds != null and changeRecordIds.size() > 0">
+                and id in
+                <foreach collection="changeRecordIds" close=")" open="(" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </if>
         </where>
             order by create_time desc
     </select>
@@ -98,6 +108,9 @@
             <if test="itemId != null ">
                 and change_item like concat('%',#{itemId},'%')
             </if>
+            <if test="skuId != null ">
+                and change_sku like concat('%',#{skuId},'%')
+            </if>
             <if test="supplier != null ">
                 and change_supplier = #{supplier}
             </if>

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -91,11 +91,14 @@ public class ChangeFlowController {
                                               @RequestParam(name = "changeCommander", required = false) String changeCommander,
                                               @RequestParam(name = "changeDepartment", required = false) String changeDepartment,
                                               @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
+                                              @RequestParam(name = "changeExecUser", required = false) String changeExecUser,
                                               @RequestParam(name = "startTime", required = false) Long startTime,
                                               @RequestParam(name = "endTime", required = false) Long endTime,
                                               @RequestParam(name = "flowId", required = false) Long flowId) {
         ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
+        changeFlowListQueryReq.setChangeExecUser(changeExecUser);
         changeFlowListQueryReq.setItemId(itemId);
+        changeFlowListQueryReq.setSkuId(skuId);
         changeFlowListQueryReq.setSupplier(supplier);
         changeFlowListQueryReq.setParentChangeClassId(parentChangeClassId);
         changeFlowListQueryReq.setSonChangeClassId(sonChangeClassId);