首次提交

src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@@ -1300,4 +1300,18 @@ public class EamController {
         return R.ok().put("rows", resultList).put("total",resultList.size());
     }
 
+    /**
+     * @Description TODO
+     * @Title eamWorkOrderItemSearch
+      * @param inData 
+     * @author rq
+     * @date 2023/3/10 11:08 
+     * @return R
+     * @throw
+     */
+    @PostMapping("/eamWorkOrderItemSearch")
+    public R eamWorkOrderItemSearch(@RequestBody EamWorkOrderItemInData inData){
+        List<EamWorkOrderItemInData> resultList = eamService.eamWorkOrderItemSearch(inData);
+        return R.ok().put("rows", resultList).put("total",resultList.size());
+    }
 }

src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderItemInData.java

@@ -0,0 +1,24 @@
+package com.xujie.sys.modules.pms.data;
+
+import java.util.List;
+
+public class EamWorkOrderItemInData extends EamWorkOrderItemData{
+    private String planID;
+    private List<EamWorkPlanItemAvailableData> availableList;
+
+    public String getPlanID() {
+        return planID;
+    }
+
+    public void setPlanID(String planID) {
+        this.planID = planID;
+    }
+
+    public List<EamWorkPlanItemAvailableData> getAvailableList() {
+        return availableList;
+    }
+
+    public void setAvailableList(List<EamWorkPlanItemAvailableData> availableList) {
+        this.availableList = availableList;
+    }
+}

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -437,4 +437,15 @@ public interface EamMapper {
      * @throw
      */
     List<EamObjectData> checkEamLocationDelete(EamLocationData inData);
+
+    /**
+     * @Description
+     * @Title eamWorkPlanItemSearchForReport
+     * @param
+     * @author rq
+     * @date 2023/3/7 17:28
+     * @return List<EamObjectData>
+     * @throw
+     */
+    List<EamWorkOrderItemInData> eamWorkPlanItemSearchForReport(EamWorkOrderItemInData inData);
 }

src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@@ -747,4 +747,15 @@ public interface EamService {
      * @throw
      */
     List<EamObjectInData> getObjectList(EamObjectInData inData);
+
+    /**
+     * @Description TODO
+     * @Title eamWorkOrderItemSearch 
+      * @param inData 
+     * @author rq
+     * @date 2023/3/10 11:40
+     * @return List<EamWorkOrderItemInData>
+     * @throw
+     */
+    List<EamWorkOrderItemInData> eamWorkOrderItemSearch(EamWorkOrderItemInData inData);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -386,8 +386,10 @@ public class EamServiceImpl implements EamService {
             inData.setMinValue(null);
         }else {
             inData.setValueType("数字");
-            if(inData.getMaxValue()<inData.getMinValue()){
-                throw new RuntimeException("最大值不能小于最小值!");
+            if(inData.getMaxValue()!=null&&inData.getMinValue()!=null){
+                if(inData.getMaxValue()<inData.getMinValue()){
+                    throw new RuntimeException("最大值不能小于最小值!");
+                }
             }
         }
         List<EamPropertiesItemData> checkPropertiesItemLevel=eamDao.checkEamPropertiesItem(inData);
@@ -414,8 +416,10 @@ public class EamServiceImpl implements EamService {
             inData.setMinValue(null);
         }else {
             inData.setValueType("数字");
-            if(inData.getMaxValue()<inData.getMinValue()){
-                throw new RuntimeException("最大值不能小于最小值!");
+            if(inData.getMaxValue()!=null&&inData.getMinValue()!=null) {
+                if (inData.getMaxValue() < inData.getMinValue()) {
+                    throw new RuntimeException("最大值不能小于最小值!");
+                }
             }
         }
         List<EamPropertiesItemData> checkEamPropertiesItem=eamDao.checkEamPropertiesItem(inData);
@@ -677,8 +681,10 @@ public class EamServiceImpl implements EamService {
             inData.setMinValue(null);
         }else {
             inData.setValueType("数字");
-            if(inData.getMaxValue()<inData.getMinValue()){
-                throw new RuntimeException("最大值不能小于最小值!");
+            if(inData.getMaxValue()!=null&&inData.getMinValue()!=null) {
+                if (inData.getMaxValue() < inData.getMinValue()) {
+                    throw new RuntimeException("最大值不能小于最小值!");
+                }
             }
         }
         eamMapper.updatePlanItems(inData);
@@ -838,4 +844,22 @@ public class EamServiceImpl implements EamService {
     public List<EamObjectInData> getObjectList(EamObjectInData inData){
         return eamMapper.getObjectList(inData);
     }
+
+
+    @Override
+    public List<EamWorkOrderItemInData> eamWorkOrderItemSearch(EamWorkOrderItemInData inData){
+        List<EamWorkOrderItemInData> result= eamMapper.eamWorkPlanItemSearchForReport(inData);
+        for (int i = 0; i < result.size(); i++) {
+            EamWorkPlanItemData searchData=new EamWorkPlanItemData();
+            searchData.setSite(inData.getSite());
+            searchData.setItemNo(result.get(i).getItemNo());
+            searchData.setPlanID(inData.getPlanID());
+            searchData.setItemType(inData.getItemType());
+            List<EamWorkPlanItemAvailableData> availableDataList=eamMapper.searchPlanItemAvailable(searchData);
+            result.get(i).setAvailableList(availableDataList);
+        }
+        return result;
+    }
+
+
 }

src/main/resources/mapper/pms/EamMapper.xml

@@ -310,8 +310,10 @@ ItemRemark=#{itemRemark}
 
 <select id="eamWorkOrderSearch"  parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         SELECT a.Site,a.OrderNo,a.PlanID,a.PropertiesCode,a.ObjectID,a.Status,a.PlanOperator,a.ActualOperator,a.PlanDate,a.ActualDate,
-a.FunctionType,a.CreateDate,a.CreateBy,a.Remark,a.StartTime,a.EndTime,a.WorkTime
+a.FunctionType,a.CreateDate,a.CreateBy,a.Remark,a.StartTime,a.EndTime,a.WorkTime,dbo.eam_Get_eamAdminName(a.Site,a.PlanOperator) PlanOperatorName,
+dbo.eam_Get_eamAdminName(a.Site,a.ActualOperator) ActualOperatorName 
         FROM eam_workOrder a
+
         <where>
                 and  a.Site=#{query.site}
              <if test="query.orderNo != null and query.orderNo != ''">
@@ -410,4 +412,11 @@ a.FunctionType,a.CreateDate,a.CreateBy,a.Remark,a.StartTime,a.EndTime,a.WorkTime
 <select id="checkEamLocationDelete" resultType="com.xujie.sys.modules.pms.data.EamObjectData">
     SELECT  site ,objectID  from eam_object where  site=#{site} and LocationID=#{locationID}
 </select>
+
+<select id="eamWorkPlanItemSearchForReport" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderItemInData">
+    SELECT Site,#{orderNo},ItemNo,ItemDesc,DefaultValue,ValueType,ValueType_DB,ValueChooseFlag,MaxValue,MinValue,
+ItemRemark,ItemType
+    from eam_workPlan_item where site=#{site} and planID=#{planID}
+</select>
+
 </mapper>