2023-08-01，设备和质量修改

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

@@ -8,101 +8,34 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 public class EamWorkOrderData extends QueryPage {
-    /**
-     *
-     */
     private String site;
-
-    /**
-     *
-     */
     private String orderNo;
-
-    /**
-     *
-     */
     private String planID;
     private String planDesc;
     private String result;
-    /**
-     *
-     */
     private String propertiesCode;
-
-    /**
-     *
-     */
     private String objectID;
-
-    /**
-     *
-     */
     private String status;
-
-    /**
-     *
-     */
     private String planOperator;
     // 审核员
     private String checker;
-
-    /**
-     *
-     */
     private String actualOperator;
-
-    /**
-     *
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date planDate;
-
-    /**
-     *
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date actualDate;
-
-    /**
-     *
-     */
     private String functionType;
-
-    /**
-     *
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
-
-    /**
-     *
-     */
     private String createBy;
-
-    /**
-     *
-     */
     private String remark;
-
     // 处置措施
     private String disposalMeasures;
-
-    /**
-     *
-     */
     private String startTime;
-
-    /**
-     *
-     */
     private String endTime;
-
-    /**
-     *
-     */
     private BigDecimal workTime;
     // 点检结论
     private String checkResult;

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

@@ -15,7 +15,6 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endDate;
-
     private String userId;
     private String planOperatorName;
     private String actualOperatorName;
@@ -23,7 +22,6 @@ public class EamWorkOrderInData extends  EamWorkOrderData{
     private String checkerName;
     private String codeDesc;
     private String mesUser;
-
     private String defectID;
     private String defectDesc;
     private String urgency;

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

@@ -1100,4 +1100,6 @@ public interface EamMapper {
     void updatePlanStatus(EamWorkPlanInData planData);
 
     void forInsertWorkOrder(EamWorkPlanInData planData);
+
+    List<SysOssEntity> queryFileByOrderNoAndItemNo(EamWorkOrderItemInData eamWorkOrderItemInData);
 }

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

@@ -1418,7 +1418,7 @@ public class EamServiceImpl implements EamService {
     @Transactional
     public void saveCheckOrderReport(EamWorkOrderInData inData){
         List<EamWorkOrderInData> checkOrderStatus = eamMapper.checkEamOrderStatus(inData);
-        if(checkOrderStatus.size()==0){
+        if(checkOrderStatus.size() == 0){
             throw new RuntimeException("该工单已不存在请刷新界面");
         }
         if(!"未开工".equals(checkOrderStatus.get(0).getStatus())){
@@ -1431,6 +1431,16 @@ public class EamServiceImpl implements EamService {
         inData.setActualOperator(check.get(0).getAdminID());
         eamMapper.reportWorkOrder(inData);
         for (int i = 0; i <inData.getItemList().size() ; i++) {
+            // 检查项目是否图片必填
+            if (inData.getItemList().get(i).getImageFlag() != null){
+                if (inData.getItemList().get(i).getImageFlag().equals("Y")) {
+                    // 检查是否已上传图片
+                    List<SysOssEntity> ossList = eamMapper.queryFileByOrderNoAndItemNo(inData.getItemList().get(i));
+                    if (ossList.size() <= 0) {
+                        throw new RuntimeException("项目 " + inData.getItemList().get(i).getItemNo() + " 未上传图片！");
+                    }
+                }
+            }
             inData.getItemList().get(i).setPlanID(inData.getPlanID());
             inData.getItemList().get(i).setCreatedBy(inData.getMesUser());
 //            if("B".equals(inData.getItemList().get(i).getItemType())){

src/main/java/com/xujie/sys/modules/sys/service/impl/SysFileServiceImpl.java

@@ -84,7 +84,7 @@ public class SysFileServiceImpl implements SysFileService {
         ossEntity.setOrderRef2(inData.getObjectID());
         if (inData.getFolder().equals("reportFault") || inData.getFolder().equals("reportSparPart")){
             ossEntity.setOrderRef3(inData.getFolder());
-        }else if (inData.getFolder().equals("itemImageFile")) {
+        }else if (inData.getFolder().equals("DJItemImageFile") || inData.getFolder().equals("WBItemImageFile")) { // 点检和维保的项目图片上传
             ossEntity.setOrderRef3(inData.getOrderRef1());
         } else {
             ossEntity.setOrderRef3(inData.getRemark());

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

@@ -1349,11 +1349,11 @@ b.MinValue,b.ItemRemark,b.ItemType
             el.LocationName
         FROM eam_workPlan as ewP
         LEFT JOIN eam_object as eo
-        ON ewP.ObjectID = eo.ObjectID
+        ON ewP.ObjectID = eo.ObjectID and ewP.Site = eo.Site
         LEFT JOIN eam_family as ef
-        ON eo.FamilyID = ef.FamilyID
+        ON eo.FamilyID = ef.FamilyID and ewP.Site = ef.Site
         LEFT JOIN eam_location as el
-        ON eo.LocationID = el.LocationID
+        ON eo.LocationID = el.LocationID and ewP.Site = el.Site
         <where>
             ewP.site = #{site}
             AND ewp.PlanID = #{planID}
@@ -1786,4 +1786,15 @@ b.MinValue,b.ItemRemark,b.ItemType
         and FunctionType = #{functionType}
         and ObjectID = #{objectID}
     </update>
+
+    <!-- 获得工单号 -->
+    <select id="queryFileByOrderNoAndItemNo" resultType="SysOssEntity" parameterType="EamWorkOrderItemInData">
+        SELECT
+            id,
+            file_name
+        FROM sys_oss
+        WHERE order_ref1 = #{site}
+        AND order_ref2 = #{orderNo}
+        AND order_ref3 = #{itemNo}
+    </select>
 </mapper>