From 44c8747b9ba9cfdbc9a08187066bb983b117e871 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 30 Dec 2024 02:36:54 +0800
Subject: [PATCH] 2

---
 .../controller/OperatorGroupController.java   |  2 ++
 .../sys/modules/production/data/Operator.java | 10 ++++++++-
 .../impl/OperatorGroupServiceImpl.java        |  4 ++--
 .../mapper/production/OperatorGroupMapper.xml | 21 ++++++++++---------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/production/controller/OperatorGroupController.java b/src/main/java/com/xujie/sys/modules/production/controller/OperatorGroupController.java
index 59ed478..549ebde 100644
--- a/src/main/java/com/xujie/sys/modules/production/controller/OperatorGroupController.java
+++ b/src/main/java/com/xujie/sys/modules/production/controller/OperatorGroupController.java
@@ -41,6 +41,8 @@ public class OperatorGroupController {
     @PostMapping(value="/saveOperatorGroupDetail")
     @ResponseBody
     public R saveOperatorGroupDetail(@RequestBody OperatorGroupPlanHeaderData data){
+        operatorGroupService.saveOperatorGroupDetail(data);
+
         return R.ok();
     }
 
diff --git a/src/main/java/com/xujie/sys/modules/production/data/Operator.java b/src/main/java/com/xujie/sys/modules/production/data/Operator.java
index 5d1923c..790549c 100644
--- a/src/main/java/com/xujie/sys/modules/production/data/Operator.java
+++ b/src/main/java/com/xujie/sys/modules/production/data/Operator.java
@@ -12,7 +12,7 @@ public class Operator {
      *
      */
     private String operatorID;
-
+    private String operatorGroupId;
     /**
      *
      */
@@ -119,5 +119,13 @@ public class Operator {
     public void setOperatorGroupFlag(String operatorGroupFlag) {
         this.operatorGroupFlag = operatorGroupFlag;
     }
+
+    public String getOperatorGroupId() {
+        return operatorGroupId;
+    }
+
+    public void setOperatorGroupId(String operatorGroupId) {
+        this.operatorGroupId = operatorGroupId;
+    }
 }
 
diff --git a/src/main/java/com/xujie/sys/modules/production/service/impl/OperatorGroupServiceImpl.java b/src/main/java/com/xujie/sys/modules/production/service/impl/OperatorGroupServiceImpl.java
index 69a634c..3c9428a 100644
--- a/src/main/java/com/xujie/sys/modules/production/service/impl/OperatorGroupServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/production/service/impl/OperatorGroupServiceImpl.java
@@ -49,9 +49,9 @@ public class OperatorGroupServiceImpl implements OperatorGroupService {
             if(result.size()>0){
                 throw new RuntimeException("该操作组班次已经存在！！！");
             }
-            Integer id =operatorGroupMapper.saveHeader(inData);
+            operatorGroupMapper.saveHeader(inData);
             for (int i = 0; i <inData.getDetailList().size() ; i++) {
-                inData.getDetailList().get(i).setPlanId(id);
+                inData.getDetailList().get(i).setPlanId(inData.getId());
             }
         }
         operatorGroupMapper.deleteDetail(inData);
diff --git a/src/main/resources/mapper/production/OperatorGroupMapper.xml b/src/main/resources/mapper/production/OperatorGroupMapper.xml
index a6e20f5..d980533 100644
--- a/src/main/resources/mapper/production/OperatorGroupMapper.xml
+++ b/src/main/resources/mapper/production/OperatorGroupMapper.xml
@@ -23,7 +23,7 @@
 
     <select id="getOperatorGroupPlanHeader" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanHeaderData">
         select a.Site,a.OperatorGroupId,a.WorkDate,a.Shiftno,a.allTime,a.WagesTime,a.id,b.OperatorName ,c.shiftdesc
-        from OperatorGroupPlanHeader a left join Operator b on a.OperatorGroupId=b.OperatorID
+        from OperatorGroupPlanHeader a left join Operator b on a.OperatorGroupId=b.OperatorID and a.site=b.site
         left join ShiftInfo C on a.Shiftno=c.shiftno
             <where>
             <if test = "site != null and site != ''">
@@ -49,7 +49,7 @@
 
         <select id="getOperatorGroupPlanDetail" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanDetailData">
         select a.PlanId,a.operatorID,a.workTime,a.WagesRate,a.Site,b.OperatorName
-        from OperatorGroupPlanDetail a left join Operator b on a.operatorID=b.OperatorID
+        from OperatorGroupPlanDetail a left join Operator b on a.operatorID=b.OperatorID and a.site=b.site
             <where>
             <if test = "site != null and site != ''">
                 AND a.Site LIKE  #{site}
@@ -65,29 +65,30 @@
 
     </select>
     <select id="getOperatorGroupDefault" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanDetailData">
-        select a.Member_OperatorID OperatorID,b.operatorName,null as workTime ,1 as WagesRate
-        from Operator_group_member a left join Operator b on a.Member_OperatorID=b.OperatorID
-        where a.OperatorID =#{operatorID} and b.Active='Y'
+        select a.site, a.Member_OperatorID OperatorID,b.operatorName,null as workTime ,1 as WagesRate
+        from Operator_group_member a left join Operator b on a.Member_OperatorID=b.OperatorID and a.site=b.site
+        where a.OperatorID =#{operatorGroupId} and b.Active='Y' and a.site=#{site}
     </select>
 
     <select id="updateHeader" >
-        update OperatorGroupPlanHeader set allTime=#{allTime,jdbcType=DOUBLE} and WagesTime=#{wagesTime,javaType=double}
+        update OperatorGroupPlanHeader set allTime=#{allTime,jdbcType=DOUBLE} , WagesTime=#{wagesTime,javaType=double}
         where id=#{id}
     </select>
 
     <select id="checkHeader" resultType="com.xujie.sys.modules.production.data.OperatorGroupPlanHeaderData">
-        select  id from OperatorGroupPlanHeader where operatorID=#{operatorGroupId} and shiftno=#{shiftno}
+        select  id from OperatorGroupPlanHeader where OperatorGroupId=#{operatorGroupId} and shiftno=#{shiftno}
+        and workDate=#{workDate}
     </select>
 
-    <insert id="saveHeader" keyProperty="id">
+    <insert id="saveHeader" useGeneratedKeys="true" keyProperty="id">
         insert into OperatorGroupPlanHeader(Site,OperatorGroupId,WorkDate,Shiftno,allTime,WagesTime)
          values   (#{site},#{operatorGroupId},#{workDate},#{shiftno},#{allTime},#{wagesTime}
-        }
+        )
     </insert>
 
     <insert id="saveDetail">
         insert into OperatorGroupPlanDetail(PlanId,operatorID,workTime,WagesRate,Site)
-        valuse(#{planId},#{operatorID},#{workTime},#{wagesRate},#{site})
+        values (#{planId},#{operatorID},#{workTime},#{wagesRate},#{site})
 </insert>
     <delete id="deleteDetail">
         delete  from OperatorGroupPlanDetail where PlanId=#{id}