2025.06.03 1、问题编号：100613 问题描述：维修记录没有时间筛选功能

目前换线专家组维修工单、设备维修组维修工单都有维修记录功能 2、问题编号：200029 问题描述：维保项目清单里的维保项目可以自定义排序，保养方便维保模板里的维保项目目前不可以自定义排序，点检模板里的点检项目同理，可以参考QMS里的检验模板
1 year ago · cd608005f7
6 changed files with 145 additions and 4 deletions
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
@ -2433,4 +2433,35 @@ public class EamController {
        eamService.updateRepairTypes(list);
        return R.ok();
    }
+
+    /**
+     * @Description 属性上移
+     * @Title goUpItemEam
+     * @param inData
+     * @author yjy
+     * @date 2025/05/30 16:20
+     * @return R
+     * @throw
+     */
+    @PostMapping("/goUpItemEam")
+    @ResponseBody
+    public R goUpItemEam(@RequestBody EamPropertiesModelDetailData inData){
+        eamService.goUpItem(inData);
+        return R.ok();
+    }
+    /**
+     * @Description 属性下移
+     * @Title goDownItemEam
+     * @param inData
+     * @author yjy
+     * @date 2025/05/30 16:20
+     * @return R
+     * @throw
+     */
+    @PostMapping("/goDownItemEam")
+    @ResponseBody
+    public R goDownItemEam(@RequestBody EamPropertiesModelDetailData inData){
+        eamService.goDownItem(inData);
+        return R.ok();
+    }
 }
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelDetailData.java
@ -54,6 +54,8 @@ public class EamPropertiesModelDetailData {
    private String buDesc;
    private String checkType;

+    private Integer orderId;
+
    public String getCheckType() {
        return checkType;
    }
@ -277,5 +279,13 @@ public class EamPropertiesModelDetailData {
    public void setSite(String site) {
        this.site = site;
    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
 }

--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@ -479,4 +479,12 @@ public interface EamMapper {
    void updateMessageNotification(EamWorkOrderInData inData);

    void updateRepairTypes(EamWorkOrderInData inData);
+
+    Integer getOrderId(EamPropertiesModelDetailData inData);
+
+    EamPropertiesModelDetailData getUpItemdataEam(EamPropertiesModelDetailData inData);
+
+    EamPropertiesModelDetailData getDownItemdataEam(EamPropertiesModelDetailData inData);
+
+    void updateEamItemOrder(EamPropertiesModelDetailData inData);
 }
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
@ -1180,4 +1180,8 @@ public interface EamService {
    void sendThreeColourLight();

    void updateRepairTypes(List<EamWorkOrderInData> list);
+
+    void goUpItem(EamPropertiesModelDetailData inData);
+
+    void goDownItem(EamPropertiesModelDetailData inData);
 }
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@ -904,6 +904,7 @@ public class EamServiceImpl implements EamService {
            itemDate.setCodeNo(inData.getCodeNo());
            itemDate.setUserId(inData.getUserId());
            itemDate.setCheckType(inData.getCheckType());
+            itemDate.setOrderId(eamMapper.getOrderId(inData));
            List<EamPropertiesModelDetailData> checkDetail = eamMapper.checkModalDetails(itemDate);
            if (!checkDetail.isEmpty()) {
                if("A".equals(inData.getFunctionType()) || "B".equals(inData.getFunctionType())) {
@ -3779,6 +3780,32 @@ public class EamServiceImpl implements EamService {
        });
    }

+    @Override
+    public void goUpItem(EamPropertiesModelDetailData inData) {
+        EamPropertiesModelDetailData checkData = eamMapper.getUpItemdataEam(inData);
+        if (checkData == null) {
+            throw new RuntimeException("XXX");//如果是第一个 那么不执行 随便给个提示 前端不显示
+        }
+        Integer number = inData.getOrderId();
+        inData.setOrderId(checkData.getOrderId());
+        checkData.setOrderId(number);
+        eamMapper.updateEamItemOrder(inData);
+        eamMapper.updateEamItemOrder(checkData);
+    }
+
+    @Override
+    public void goDownItem(EamPropertiesModelDetailData inData) {
+        EamPropertiesModelDetailData checkData = eamMapper.getDownItemdataEam(inData);
+        if (checkData == null) {
+            throw new RuntimeException("XXX");//如果是最后一个 那么不执行 随便给个提示 前端不显示
+        }
+        Integer number = inData.getOrderId();
+        inData.setOrderId(checkData.getOrderId());
+        checkData.setOrderId(number);
+        eamMapper.updateEamItemOrder(inData);
+        eamMapper.updateEamItemOrder(checkData);
+    }
+
    public Long calculateFutureTime(Date lastTime,String minutes) {
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(lastTime);
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@ -442,10 +442,11 @@
             b.MinValue,
             b.ItemRemark,
             b.ItemType,
-             a.check_type
+             a.check_type,a.order_id
         FROM eam_properties_model_detail a
         left join eam_properties_item b on a.function_type = b.itemType and a.properties_item_no = b.itemNo and a.site = b.site and a.bu_no = b.bu_no and a.check_type = b.check_type
         where a.function_type = #{functionType} and a.code_no = #{codeNo} and a.site = #{site} and a.bu_no = #{buNo} and a.check_type = #{checkType}
+         order by order_id
    </select>

    <select id="checkItem" resultType="EamPropertiesModelDetailData">
@ -476,8 +477,9 @@

    <insert id="saveModalDetails">
        insert into eam_properties_model_detail
-            (function_type, code_no, properties_item_no, seq_no, created_date, created_by, delflag, version, site, bu_no, check_type)
-        values (#{functionType}, #{codeNo}, #{itemNo}, #{seqNo}, GetDate(), #{userId}, 'N', 0, #{site}, #{buNo}, #{checkType})
+            (function_type, code_no, properties_item_no, seq_no, created_date, created_by, delflag, version, site,
+             bu_no, check_type, order_id)
+        values (#{functionType}, #{codeNo}, #{itemNo}, #{seqNo}, GetDate(), #{userId}, 'N', 0, #{site}, #{buNo}, #{checkType}, #{orderId})
    </insert>


@ -2189,7 +2191,15 @@
        LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID and ewo.bu_no = eo.bu_no
        LEFT JOIN eam_defect_feedBack as edf ON ewo.site = edf.site and ewo.PlanID = edf.FeedBackID and ewo.bu_no = edf.bu_no
        LEFT JOIN eam_defect as ed ON ed.DefectID = edf.DefectID
-        WHERE ewo.site = #{query.site} and ewo.bu_no = #{query.buNo} and ewo.ObjectID = #{query.objectID} and ewo.FunctionType = #{query.functionType} AND (ewo.Status = '已完工' or ewo.Status = '待审核') ORDER BY ewo.ActualDate desc
+        <where>ewo.site = #{query.site} and ewo.bu_no = #{query.buNo} and ewo.ObjectID = #{query.objectID} and
+            ewo.FunctionType = #{query.functionType} AND (ewo.Status = '已完工' or ewo.Status = '待审核')
+            <if test="query.startDate != null ">
+                AND ewo.ActualDate >= #{query.startDate}
+            </if>
+            <if test="query.endDate != null ">
+                AND #{query.endDate} >= ewo.ActualDate
+            </if>
+        </where>  ORDER BY ewo.ActualDate desc
    </select>

    <!-- 查询部门列表 -->
@ -3594,6 +3604,14 @@
            </if>
        </where>
    </select>
+    <select id="getOrderId" resultType="java.lang.Integer">
+        SELECT isnull(max(order_id), 0) + 1
+        from eam_properties_model_detail
+        where site = #{site}
+          and bu_no= #{buNo}
+          and function_type = #{functionType}
+          and code_no = #{codeNo}
+    </select>

    <update id="updateOrderStatus" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
        update eam_workOrder
@ -3611,4 +3629,47 @@
        SET repair_type = #{repairType}
        WHERE site = #{site} AND bu_no = #{buNo} AND OrderNo = #{orderNo}
    </update>
+    <update id="updateEamItemOrder">
+        update eam_properties_model_detail
+        set order_id=#{orderId}
+        where site = #{site}
+          and bu_no= #{buNo}
+            and properties_item_no = #{itemNo}
+            and code_no = #{codeNo}
+            and function_type = #{functionType}
+    </update>
+    <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
+        select
+            top 1
+            site,
+            bu_no,
+            properties_item_no as itemNo,
+            code_no,
+            function_type,
+            order_id
+        from eam_properties_model_detail
+        where #{orderId} > order_id
+          and site = #{site}
+          and bu_no= #{buNo}
+          and code_no = #{codeNo}
+          and function_type = #{functionType}
+        order by order_id desc
+    </select>
+    <select id="getDownItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
+        select
+            top 1
+            site,
+            bu_no,
+            properties_item_no as itemNo,
+            code_no,
+            function_type,
+            order_id
+        from eam_properties_model_detail
+        where order_id > #{orderId}
+          and site = #{site}
+          and bu_no= #{buNo}
+          and code_no = #{codeNo}
+          and function_type = #{functionType}
+        order by order_id
+    </select>
 </mapper>