2023-11-10，设备和质量修改2

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

@@ -1163,4 +1163,6 @@ public interface EamMapper {
     void updateReportResult(EamWorkOrderInData inData);
 
     List<EamAdminData> eamAdminSearch2(EamAdminData inData);
+
+    void reportWorkOrder2(EamWorkOrderInData inData);
 }

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

@@ -1442,7 +1442,7 @@ public class EamServiceImpl implements EamService {
     public List<EamWorkOrderItemInData> eamWorkOrderItemSearch(EamWorkOrderItemInData inData){
         List<EamWorkOrderItemInData> result = eamMapper.eamWorkPlanItemSearchForReport(inData);
         // 如果是点检，则查点检项目是否值可选，取出可选值
-        if ("A".equals(inData.getFunctionType())) {
+//        if ("A".equals(inData.getFunctionType())) {
             for (int i = 0; i < result.size(); i++) {
                 if (StringUtils.isNotBlank(result.get(i).getValueChooseFlag()) && "Y".equals(result.get(i).getValueChooseFlag())) {
                     EamWorkPlanItemData searchData = new EamWorkPlanItemData();
@@ -1455,7 +1455,7 @@ public class EamServiceImpl implements EamService {
                     result.get(i).setAvailableList(availableDataList);
                 }
             }
-        }
+//        }
         return result;
     }
 
@@ -1478,19 +1478,20 @@ public class EamServiceImpl implements EamService {
         }
         inData.setActualOperator(check.get(0).getAdminID());
 
-        if ("B".equals(inData.getFunctionType())) {
+        if ("B".equals(inData.getFunctionType()) || "A".equals(inData.getFunctionType())) {
             // 获取当前时间为实际执行时间
             String dateNow = DateUtils.getStringNow();
             Date actualDate = DateUtils.getStringToDate(dateNow, "yyyy-MM-dd HH:mm:ss");
             inData.setActualDate(actualDate);
-//            // 计算工时
-//            long between = cn.hutool.core.date.DateUtil.between(inData.getReachDate(), inData.getActualDate(), DateUnit.MINUTE);
-//            BigDecimal workTime = new BigDecimal(between);
-//            inData.setWorkTime(workTime);
         }
 
         // 更新工单信息
-        eamMapper.reportWorkOrder(inData);
+        if ("A".equals(inData.getFunctionType())) {
+            eamMapper.reportWorkOrder2(inData);
+        } else if ("B".equals(inData.getFunctionType()) ) {
+            eamMapper.reportWorkOrder(inData);
+        }
+
         for (int i = 0; i <inData.getItemList().size(); i++) {
             // 检查项目是否图片必填
             if (inData.getItemList().get(i).getImageFlag() != null) {

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

@@ -556,7 +556,7 @@
     </where>
 </select>
 
-<select id="searchPlanItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamWorkPlanItemAvailableData">
+    <select id="searchPlanItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamWorkPlanItemAvailableData">
         SELECT
             Site,
             PlanID,
@@ -570,12 +570,8 @@
             UpdateBy,
             ObjectID
         from eam_workPlan_item_available
-        where PlanID = #{planID}
-        and itemNo = #{itemNo}
-        and site = #{site}
-        and ItemType = #{itemType}
-        and ObjectID = #{objectID}
-</select>
+        where PlanID = #{planID} and itemNo = #{itemNo} and site = #{site} and ItemType = #{itemType} and ObjectID = #{objectID}
+    </select>
 
 <update id="updatePlanItems">
     update eam_workPlan_item
@@ -672,7 +668,6 @@
         LEFT JOIN eam_defect_feedBack b on a.site = b.site and a.PlanID = b.feedBackID
         LEFT JOIN eam_defect c on b.DefectID = c.DefectID
         LEFT JOIN operator as d on a.site = d.site and a.CreateBy = d.operator_id and d.active = 'Y'
-
         left join eam_object as eo on eo.site  = a.site and eo.ObjectID = a.ObjectID
         left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id
         left join eam_admin_dept as ead ON ead.site = sd.site and ead.dept_id = sd.department_id
@@ -976,6 +971,20 @@
        where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType}
     </update>
 
+    <update id="reportWorkOrder2" parameterType="EamWorkOrderInData">
+        update eam_workOrder
+        set Status = '待审核',
+            ActualOperator = #{actualOperator},
+            ActualDate = #{actualDate},
+            Remark = #{remark},
+            disposal_measures = #{disposalMeasures},
+            WorkTime = #{workTime},
+            result = #{result,jdbcType=VARCHAR},
+            checkResult = #{checkResult},
+            handling_method = #{handlingMethod}
+        where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType}
+    </update>
+
     <update id="defectReportWorkOrder" >
         update eam_workOrder
         set Status = '已完工',
@@ -1032,8 +1041,7 @@
             FinishFlag,
             itemResult
         from eam_workOrder_item
-        where site = #{site}
-        and orderNo = #{orderNo}
+        where site = #{site} and orderNo = #{orderNo}
     </select>
 
     <update id="cancelOrder" parameterType="EamWorkOrderInData">
@@ -1779,10 +1787,7 @@
             ewo.checkResult
         FROM eam_workOrder as ewo
         LEFT JOIN eam_object as eo ON ewo.site = eo.site and ewo.ObjectID = eo.ObjectID
-        WHERE ewo.site = #{site}
-        AND ewo.ObjectID = #{objectID}
-        AND ewo.FunctionType = #{functionType}
-        AND ewo.Status = '已完工'
+        WHERE ewo.site = #{site} AND ewo.ObjectID = #{objectID} AND ewo.FunctionType = #{functionType} AND ewo.Status = '已完工'
         ORDER BY ewo.ActualDate desc
     </select>