2026-05-09

RoHs功能优化

src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java

@@ -263,6 +263,7 @@ public class BaseServiceImpl implements BaseService {
         ossEntity.setCreateDate(new Date());
         ossEntity.setOrderRef1(inData.getOrderRef1());
         ossEntity.setOrderRef2(inData.getOrderRef2());
+        ossEntity.setOrderRef3(inData.getOrderRef3());
         ossEntity.setFileRemark(inData.getFileRemark());
         sysOssService.save(ossEntity);
         return ossEntity;
@@ -313,6 +314,7 @@ public class BaseServiceImpl implements BaseService {
             ossEntity.setCreateDate(new Date());
             ossEntity.setOrderRef1(inData.getOrderRef1());
             ossEntity.setOrderRef2(inData.getOrderRef2());
+            ossEntity.setOrderRef3(inData.getOrderRef3());
             ossEntity.setFileRemark(inData.getFileRemark());
             sysOssService.save(ossEntity);
             ossEntityList.add(ossEntity);

src/main/java/com/spring/modules/rohs/entity/RohsEntity.java

@@ -256,6 +256,66 @@ public class RohsEntity implements Serializable {
      */
     private String commGroup3;
 
+    /**
+     * 申请人名称
+     */
+    @TableField(exist = false)
+    private String applicantName;
+
+    /**
+     * PM人员名称
+     */
+    @TableField(exist = false)
+    private String pmName;
+
+    /**
+     * NPD工程师名称
+     */
+    @TableField(exist = false)
+    private String npdEngineerName;
+
+    /**
+     * 技术计划名称
+     */
+    @TableField(exist = false)
+    private String technicalPlanName;
+
+    /**
+     * 采购名称
+     */
+    @TableField(exist = false)
+    private String buyerName;
+
+    /**
+     * 最终客户名称
+     */
+    @TableField(exist = false)
+    private String endCustomerName;
+
+    /**
+     * 项目名称
+     */
+    @TableField(exist = false)
+    private String projectName;
+
+    /**
+     * 商品组1描述
+     */
+    @TableField(exist = false)
+    private String commGroup1Desc;
+
+    /**
+     * 商品组2描述
+     */
+    @TableField(exist = false)
+    private String commGroup2Desc;
+
+    /**
+     * 商品组3描述
+     */
+    @TableField(exist = false)
+    private String commGroup3Desc;
+
     /**
      * RoHs材料明细（一对多）
      */

src/main/java/com/spring/modules/rohs/mapper/RohsMapper.java

@@ -17,5 +17,9 @@ import java.util.Map;
 public interface RohsMapper extends BaseMapper<RohsEntity> {
     List<ProcessFormVo> getApprovalList(@Param("site") String site, @Param("menuId") String menuId, @Param("documentNo") String documentNo);
 
+    IPage<RohsEntity> queryPageWithNames(IPage<?> page, @Param("params") Map<String, Object> params);
+
+    RohsEntity getDetailWithNames(@Param("site") String site, @Param("referenceNo") String referenceNo);
+
     IPage<Map<String, Object>> queryProjectMaterialPage(IPage<?> page, @Param("params") Map<String, Object> params);
 }

src/main/java/com/spring/modules/rohs/service/impl/RohsServiceImpl.java

@@ -59,27 +59,12 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
-        String site = (String) params.get("site");
-        String referenceNo = (String) params.get("referenceNo");
-        String applicant = (String) params.get("applicant");
+        params.put("referenceNo", toLikeParam((String) params.get("referenceNo")));
+        params.put("applicant", toLikeParam((String) params.get("applicant")));
 
-        QueryWrapper<RohsEntity> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(site)) {
-            queryWrapper.eq("site", site);
-        }
-        if (StringUtils.isNotBlank(referenceNo)) {
-            queryWrapper.like("reference_no", referenceNo);
-        }
-        if (StringUtils.isNotBlank(applicant)) {
-            queryWrapper.like("applicant", applicant);
-        }
-        
-        // 默认按申请时间倒序排序
-        queryWrapper.orderByDesc("application_date");
-
-        IPage<RohsEntity> page = this.page(
+        IPage<RohsEntity> page = this.baseMapper.queryPageWithNames(
                 new Query<RohsEntity>().getPage(params),
-                queryWrapper
+                params
         );
 
         return new PageUtils(page);
@@ -87,9 +72,7 @@ public class RohsServiceImpl extends ServiceImpl<RohsMapper, RohsEntity> impleme
 
     @Override
     public RohsEntity getDetail(String site, String referenceNo) {
-        QueryWrapper<RohsEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("site", site).eq("reference_no", referenceNo);
-        RohsEntity rohs = this.getOne(queryWrapper);
+        RohsEntity rohs = this.baseMapper.getDetailWithNames(site, referenceNo);
         if (rohs != null) {
             rohs.setMaterialList(this.getMaterialList(site, referenceNo));
         }

src/main/resources/mapper/rohs/RohsMapper.xml

@@ -50,6 +50,16 @@
         <result column="comm_group1" property="commGroup1" />
         <result column="comm_group2" property="commGroup2" />
         <result column="comm_group3" property="commGroup3" />
+        <result column="applicantName" property="applicantName" />
+        <result column="pmName" property="pmName" />
+        <result column="npdEngineerName" property="npdEngineerName" />
+        <result column="technicalPlanName" property="technicalPlanName" />
+        <result column="buyerName" property="buyerName" />
+        <result column="endCustomerName" property="endCustomerName" />
+        <result column="projectName" property="projectName" />
+        <result column="commGroup1Desc" property="commGroup1Desc" />
+        <result column="commGroup2Desc" property="commGroup2Desc" />
+        <result column="commGroup3Desc" property="commGroup3Desc" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -61,6 +71,51 @@
         exec dbo.get_process_form #{site},#{menuId},#{documentNo}
     </select>
 
+    <select id="queryPageWithNames" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"/>,
+            dbo.get_userDisPlay(applicant) as applicantName,
+            dbo.get_userDisPlay(pm) as pmName,
+            dbo.get_userDisPlay(npd_engineer) as npdEngineerName,
+            dbo.get_userDisPlay(technical_plan) as technicalPlanName,
+            dbo.get_userDisPlay(buyer) as buyerName,
+            dbo.plm_get_customer_desc(site, end_customer) as endCustomerName,
+            dbo.plm_get_project_name(site, project_id) as projectName,
+            dbo.get_product_group_name(site, comm_group1, '1') as commGroup1Desc,
+            dbo.get_product_group_name(site, comm_group2, '2') as commGroup2Desc,
+            dbo.get_product_group_name(site, comm_group3, '3') as commGroup3Desc
+        from plm_rohs
+        where 1 = 1
+        <if test="params.site != null and params.site != ''">
+            and site = #{params.site}
+        </if>
+        <if test="params.referenceNo != null and params.referenceNo != ''">
+            and reference_no like #{params.referenceNo}
+        </if>
+        <if test="params.applicant != null and params.applicant != ''">
+            and applicant like #{params.applicant}
+        </if>
+        order by application_date desc
+    </select>
+
+    <select id="getDetailWithNames" resultMap="BaseResultMap">
+        select
+            <include refid="Base_Column_List"/>,
+            dbo.get_userDisPlay(applicant) as applicantName,
+            dbo.get_userDisPlay(pm) as pmName,
+            dbo.get_userDisPlay(npd_engineer) as npdEngineerName,
+            dbo.get_userDisPlay(technical_plan) as technicalPlanName,
+            dbo.get_userDisPlay(buyer) as buyerName,
+            dbo.plm_get_customer_desc(site, end_customer) as endCustomerName,
+            dbo.plm_get_project_name(site, project_id) as projectName,
+            dbo.get_product_group_name(site, comm_group1, '1') as commGroup1Desc,
+            dbo.get_product_group_name(site, comm_group2, '2') as commGroup2Desc,
+            dbo.get_product_group_name(site, comm_group3, '3') as commGroup3Desc
+        from plm_rohs
+        where site = #{site}
+          and reference_no = #{referenceNo}
+    </select>
+
     <select id="queryProjectMaterialPage" resultType="java.util.HashMap">
         select
             a.site as site,