feat(檢驗作業):要因開窗

1.檢驗作業-要因開窗

refs:#15320

qms-api/src/main/java/com/foreverwin/iep/qms/domain/FactorDataSourceInfo.java

@@ -0,0 +1,10 @@
+package com.foreverwin.iep.qms.domain;
+
+import lombok.Data;
+
+@Data
+public class FactorDataSourceInfo {
+
+    private String name;
+    private String description;
+}

qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecDetailDTO.java

@@ -29,6 +29,8 @@ public class QmsInspecDetailDTO extends QmsInspecDetail {
 
     private String contentDesc;
 
+    private String eqpCategoryBo;
+
     private List<Map<String, Object>> resultList;
 
     private QmsInspecResult contentResult;

qms-api/src/main/java/com/foreverwin/iep/qms/dto/QmsInspecFactorDTO.java

@@ -11,4 +11,9 @@ public class QmsInspecFactorDTO extends QmsInspecFactor {
     private String factor;
 
     private String description;
+
+    private String inputMode;
+
+    private String dataSource;
+
 }

qms-core/src/main/java/com/foreverwin/iep/qms/controller/QmsFactorController.java

@@ -41,4 +41,16 @@ public class QmsFactorController {
                                                         .eq(QmsFactor::getSite, TenantContextHolder.getTenantId())
                                                         .orderByAsc(QmsFactor::getSeq)));
     }
+
+    @ApiOperation(value = "要因开窗-EQP_BASIS", notes = "要因开窗-EQP_BASIS")
+    @GetMapping("/dataSource/eqpBasis/{eqpCategoryBo}" )
+    public R getDataSourceEqpBasis( @PathVariable("eqpCategoryBo") String eqpCategoryBo) {
+        return R.ok(qmsFactorService.getDataSourceEqpBasis(eqpCategoryBo));
+    }
+
+    @ApiOperation(value = "要因开窗-SYS_USER", notes = "要因开窗-SYS_USER")
+    @GetMapping("/dataSource/sysUser/{userGroup}" )
+    public R getDataSourceSysUser( @PathVariable("userGroup") String userGroup) {
+        return R.ok(qmsFactorService.getDataSourceSysUser(userGroup));
+    }
 }

qms-core/src/main/java/com/foreverwin/iep/qms/service/QmsFactorService.java

@@ -1,6 +1,7 @@
 package com.foreverwin.iep.qms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.iep.qms.domain.FactorDataSourceInfo;
 import com.foreverwin.iep.qms.entity.QmsFactor;
 
 import java.util.List;
@@ -13,5 +14,7 @@ import java.util.List;
  */
 public interface QmsFactorService extends IService<QmsFactor> {
 
-    List<QmsFactor> findFactorList( String site );
+    List<FactorDataSourceInfo> getDataSourceEqpBasis(String eqpCategoryBo);
+
+    List<FactorDataSourceInfo> getDataSourceSysUser(String userGroup);
 }

qms-core/src/main/java/com/foreverwin/iep/qms/service/impl/QmsFactorServiceImpl.java

@@ -2,12 +2,19 @@ package com.foreverwin.iep.qms.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.iep.qms.domain.FactorDataSourceInfo;
 import com.foreverwin.iep.qms.entity.QmsFactor;
 import com.foreverwin.iep.qms.mapper.QmsFactorMapper;
 import com.foreverwin.iep.qms.service.QmsFactorService;
+import com.foreverwin.mom.admin.api.entity.SysUser;
+import com.foreverwin.mom.admin.api.feign.RemoteUserService;
+import com.foreverwin.mom.common.core.constant.SecurityConstants;
+import com.foreverwin.mom.common.core.util.R;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 要因主表
@@ -16,11 +23,26 @@ import java.util.List;
  * @date 2023-06-07 11:55:53
  */
 @Service
+@AllArgsConstructor
 public class QmsFactorServiceImpl extends ServiceImpl<QmsFactorMapper, QmsFactor> implements QmsFactorService {
 
+    private final RemoteUserService remoteUserService;
+
     @Override
-    public List<QmsFactor> findFactorList( String site ) {
+    public List<FactorDataSourceInfo> getDataSourceEqpBasis( String eqpCategoryBo ) {
-        return super.list(Wrappers.<QmsFactor>lambdaQuery()
+        return super.baseMapper.getDataSourceEqpBasis(eqpCategoryBo);
-                                  .eq(QmsFactor::getSite, site));
+    }
+
+    @Override
+    public List<FactorDataSourceInfo> getDataSourceSysUser( String userGroup ) {
+
+        R<List<SysUser>> list = remoteUserService.listUserByRoleCode(userGroup, SecurityConstants.FROM_IN);
+
+        return list.getData().stream().map(sysUser -> {
+            FactorDataSourceInfo info = new FactorDataSourceInfo();
+            info.setName(sysUser.getUsername());
+            info.setDescription(sysUser.getName());
+            return info;
+        }).collect(Collectors.toList());
     }
 }

qms-db/src/main/java/com/foreverwin/iep/qms/mapper/QmsFactorMapper.java

@@ -1,8 +1,12 @@
 package com.foreverwin.iep.qms.mapper;
 
+import com.foreverwin.iep.qms.domain.FactorDataSourceInfo;
 import com.foreverwin.mom.common.data.datascope.MomBaseMapper;
 import com.foreverwin.iep.qms.entity.QmsFactor;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 要因主表
@@ -13,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface QmsFactorMapper extends MomBaseMapper<QmsFactor> {
 
+    List<FactorDataSourceInfo> getDataSourceEqpBasis( @Param("eqpCategoryBo") String eqpCategoryBo);
 }

qms-db/src/main/resources/qms/mapper/QmsFactorMapper.xml

@@ -14,4 +14,19 @@
         <result property="dataSource" column="DATA_SOURCE"/>
         <result property="isDefault" column="IS_DEFAULT"/>
     </resultMap>
+    
+    <resultMap id="factorDataSourceInfoMap" type="com.foreverwin.iep.qms.domain.FactorDataSourceInfo">
+        <result property="name" column="NAME"/>
+        <result property="description" column="DESCRIPTION"/>
+    </resultMap>
+    
+    <select id="getDataSourceEqpBasis" resultMap="factorDataSourceInfoMap">
+        select b.RESRCE NAME, b.DESCRIPTION from EQP_TYPE a
+        join resrce b on a.handle = b.EQP_TYPE_BO
+        <where>
+            and a.EQP_CATEGORY_BO = #{eqpCategoryBo}
+        </where>
+        order by a.type_no
+    </select>
+    
 </mapper>

qms-db/src/main/resources/qms/mapper/QmsInspecDetailMapper.xml

@@ -31,6 +31,7 @@
         <result property="samplePlan" column="SAMPLE_PLAN"/>
         <result property="samplePlanType" column="SAMPLE_PLAN_TYPE"/>
         <result property="areaInfo" column="AREA_INFO"/>
+        <result property="eqpCategoryBo" column="EQP_CATEGORY_BO"/>
     </resultMap>
 
     <select id="selectAll" resultMap="full">
@@ -53,6 +54,7 @@
                c.DESCRIPTION QC_ITEM_DESC,
                c.ITEM_TYPE,
                c.CONTROL_MODE,
+               c.EQP_CATEGORY_BO,
                d.SAMPLE_PLAN,
                d.SAMPLE_PLAN_TYPE,
                d.AREA_INFO

qms-db/src/main/resources/qms/mapper/QmsInspecFactorMapper.xml

@@ -13,10 +13,12 @@
     <resultMap id="full" type="com.foreverwin.iep.qms.dto.QmsInspecFactorDTO" extends="qmsInspecFactorMap">
         <result property="factor" column="FACTOR"/>
         <result property="description" column="DESCRIPTION"/>
+        <result property="inputMode" column="INPUT_MODE"/>
+        <result property="dataSource" column="DATA_SOURCE"/>
     </resultMap>
 
     <select id="selectAll" resultMap="full">
-        select a.*, b.FACTOR, b.DESCRIPTION
+        select a.*, b.FACTOR, b.DESCRIPTION, b.INPUT_MODE, b.DATA_SOURCE
         from qms_inspec_factor a
                  join qms_factor b on a.FACTOR_BO = b.HANDLE
         where a.INSPEC_DETAIL_BO = #{inspecDetailBo}