首次提交

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

@@ -1027,4 +1027,52 @@ public class EamController {
         eamService.updatePlanItems(inData);
         return R.ok();
     }
+
+    /**
+     * @Description TODO
+     * @Title savePlanItemAvailable
+      * @param inData 
+     * @author rq
+     * @date 2023/3/2 15:33 
+     * @return R
+     * @throw
+     */
+    @PostMapping("/savePlanItemAvailable")
+    public R savePlanItemAvailable(@RequestBody EamWorkPlanItemAvailableData inData){
+        eamService.savePlanItemAvailable(inData);
+        return R.ok();
+    }
+
+    /**
+     * @Description TODO
+     * @Title deletePlanItemAvailable
+      * @param inData 
+     * @author rq
+     * @date 2023/3/2 16:12 
+     * @return R
+     * @throw
+     */
+    @PostMapping("/deletePlanItemAvailable")
+    public R deletePlanItemAvailable(@RequestBody EamWorkPlanItemAvailableData inData){
+        eamService.deletePlanItemAvailable(inData);
+        return R.ok();
+    }
+
+
+    /**
+     * @Description TODO
+     * @Title createEamWorkOrder 
+      * @param inData 
+     * @author rq
+     * @date 2023/3/2 18:09
+     * @return R
+     * @throw
+     */
+    @PostMapping("/createEamWorkOrder")
+    public R createEamWorkOrder(@RequestBody EamWorkPlanInData inData){
+        eamService.createEamWorkOrder(inData);
+        return R.ok();
+    }
+
+
 }

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

@@ -123,7 +123,16 @@ public interface EamMapper {
      * @throw
      */
     Double getItemValueNo(EamPropertiesItemAvailableData inData);
-    
+    /**
+     * @Description 获取值编号(计划的)
+     * @Title getItemValueNo
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 11:21
+     * @return Float
+     * @throw
+     */
+    Double getItemValueNoForPlan(EamWorkPlanItemAvailableData inData);
     /**
      * @Description TODO
      * @Title saveItemAvailable 
@@ -318,4 +327,30 @@ public interface EamMapper {
     void updatePlanItems(EamWorkPlanItemData inData);
 
     void updatePlanItemsForNull(EamWorkPlanItemData inData);
+
+    /**
+     * @Description TODO
+     * @Title saveItemAvailable
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 11:38
+     * @return void
+     * @throw
+     */
+    void saveItemAvailableForPlan(EamWorkPlanItemAvailableData inData);
+
+    /**
+     * @Description TODO
+     * @Title updateItemAvailable
+     * @param inData
+     * @author rq
+     * @date 2023/2/23 11:38
+     * @return void
+     * @throw
+     */
+    void updateItemAvailableForPlan(EamWorkPlanItemAvailableData inData);
+
+
+
+    void deletePlanItemAvailable(EamWorkPlanItemAvailableData inData);
 }

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

@@ -580,4 +580,40 @@ public interface EamService {
      * @throw
      */
     void updatePlanItems(EamWorkPlanItemData inData);
+
+    /**
+     * @Description TODO
+     * @Title savePlanItemAvailable
+      * @param inDatav
+     * @author rq
+     * @date 2023/3/2 15:36
+     * @return void
+     * @throw
+     */
+    void savePlanItemAvailable(EamWorkPlanItemAvailableData inData);
+
+
+
+    /**
+     * @param
+     * @return void
+     * @Description TODO
+     * @Title deletePlanItemAvailable
+     * @author rq
+     * @date 2023/2/23 11:43
+     * @throw
+     */
+    void deletePlanItemAvailable(EamWorkPlanItemAvailableData inData);
+
+    /**
+     * @Description TODO
+     * @Title createEamWorkOrder 
+      * @param inData 
+     * @author rq
+     * @date 2023/3/2 18:09
+     * @return void
+     * @throw
+     */
+    void createEamWorkOrder(EamWorkPlanInData inData);
+
 }

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

@@ -13,6 +13,7 @@ import com.xujie.sys.modules.pms.util.ResponseData;
 import com.xujie.sys.modules.report.dao.ProcedureDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -521,6 +522,7 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+    @Transactional
     public void eamWorkPlanSave(EamWorkPlanInData inData){
         //调用存储过程 执行
         String site = inData.getSite();
@@ -563,6 +565,7 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+    @Transactional
     public void eamWorkPlanEdit(EamWorkPlanInData inData){
         //调用存储过程 执行
         String site = inData.getSite();
@@ -605,6 +608,7 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+    @Transactional
     public void eamWorkPlanDelete(EamWorkPlanInData inData){
         //调用存储过程 执行
         String site = inData.getSite();
@@ -652,4 +656,47 @@ public class EamServiceImpl implements EamService {
         }
         eamMapper.updatePlanItems(inData);
     }
+
+    @Override
+    @Transactional
+    public void savePlanItemAvailable(EamWorkPlanItemAvailableData inData){
+        //判断是新增还是
+        if(inData.getValueNo()==0){
+            //新增
+            Double valueNo= eamMapper.getItemValueNoForPlan(inData);
+            inData.setValueNo(valueNo);
+            eamMapper.saveItemAvailableForPlan(inData);
+        }else {
+            eamMapper.updateItemAvailableForPlan(inData);
+        }
+    }
+
+
+    @Override
+    public void deletePlanItemAvailable(EamWorkPlanItemAvailableData inData){
+        eamMapper.deletePlanItemAvailable(inData);
+    }
+
+    @Override
+    @Transactional
+    public void createEamWorkOrder(EamWorkPlanInData inData){
+        //调用存储过程 执行
+        String site = inData.getSite();
+        String planID = inData.getPlanID();
+        String functionType = inData.getFunctionType();
+
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(planID);
+        params.add(functionType);
+
+        //执行方法
+        List<Map<String, Object>> resultList = procedureDao.getProcedureData("eamCreateWorkOrder", params);
+        //判断是否检验成功
+        String code = String.valueOf(resultList.get(0).get("resultCode"));
+        if ("400".equalsIgnoreCase(code)) {
+            String msg = String.valueOf(resultList.get(0).get("resultMsg"));
+            throw new XJException(msg, Integer.parseInt(code));
+        }
+    }
 }

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

@@ -130,7 +130,7 @@
         </where>
 </select>
 
-<select id="searchItemAvailable" resultType="EamPropertiesItemAvailableData">
+<select id="searchItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamPropertiesItemAvailableData">
         SELECT ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType
         from eam_properties_item_available where itemNo=#{itemNo} and ItemType=#{itemType}
 </select>
@@ -139,7 +139,9 @@
 <select id="getItemValueNo" resultType="Double">
         SELECT isnull( max(valueNo),0)+1 from eam_properties_item_available where itemNo=#{itemNo} and ItemType=#{itemType}
 </select>
-
+<select id="getItemValueNoForPlan" resultType="Double">
+        SELECT isnull( max(valueNo),0)+1 from eam_workPlan_item_available where itemNo=#{itemNo} and ItemType=#{itemType} and site=#{site} and PlanID=#{planID}
+</select>
 <insert id="saveItemAvailable">
     insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType)
     values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType})
@@ -277,8 +279,24 @@ ItemRemark=#{itemRemark}
 <update id="updatePlanItemsForNull">
     update eam_workPlan_item set  DefaultValue=#{defaultValue},ValueType=#{valueType},ValueType_DB=#{valueTypeDb}
     ,ValueChooseFlag=#{valueChooseFlag},UpdateDate=GetDate(),UpdateBy=#{createdBy},MaxValue=null,MinValue=null,
-ItemRemark=#{itemRemark}
- where  site=#{site} and  planID=#{planID} and ItemType=#{itemType}
- and ItemNo=#{itemNo}
+    ItemRemark=#{itemRemark}
+    where  site=#{site} and  planID=#{planID} and ItemType=#{itemType}
+    and ItemNo=#{itemNo}
+</update>
+
+
+<insert id="saveItemAvailableForPlan">
+    insert into eam_workPlan_item_available (Site,PlanID,ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType)
+    values(#{site},#{planID},#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType})
+</insert>
+
+<update id="updateItemAvailableForPlan">
+    update eam_workPlan_item_available set  AvailableValue=#{availableValue},updateBy=#{createdBy},updateDate=GetDate()
+    where itemNo=#{itemNo} and ItemType=#{itemType} and ValueNo=#{valueNo} AND  site=#{site} and  planID=#{planID}
 </update>
+
+
+<delete id="deletePlanItemAvailable">
+    delete  from eam_workPlan_item_available where itemNo=#{itemNo} and ItemType=#{itemType} and ValueNo=#{valueNo} AND  site=#{site} and  planID=#{planID}
+    </delete>
 </mapper>