From 9691ea372af8ff0ac7f01885f0658840d8459cfd Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 07 四月 2024 10:03:40 +0800
Subject: [PATCH] #周计划

---
 src/main/resources/mapper/WeeklyDailyPlanMapper.xml               |    1 
 src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java      |    7 +++
 src/main/java/com/zy/crm/manager/controller/WeeklyController.java |   84 ++++++++++++++++++++++++++++++++++++++++--
 src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java   |    7 +++
 src/main/resources/mapper/WeeklyDailyRealityMapper.xml            |    1 
 5 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
index c46f76c..b838e48 100644
--- a/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
+++ b/src/main/java/com/zy/crm/manager/controller/WeeklyController.java
@@ -45,6 +45,8 @@
     private WeeklyFollService weeklyFollService;
     @Autowired
     private SmsCodeService smsCodeService;
+    @Autowired
+    private CstmrService cstmrService;
 
     String PZH = " 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
     Integer PBN = 3;
@@ -497,8 +499,6 @@
                 throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDailyPlanList");
             } else if (Cools.isEmpty(param.getWeeklyId())){
                 throw new CoolException("鍙傛暟涓虹┖锛歐eeklyId");
-            } else if (Cools.isEmpty(param.getWeeklyType())){
-                throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDailyPlanList");
             } else if (Cools.isEmpty(param.getType())){
                 throw new CoolException("鍙傛暟涓虹┖锛歍ype");
             } else if (Cools.isEmpty(param.getWeeklyType())){
@@ -595,8 +595,6 @@
                 throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDailyRealityList");
             } else if (Cools.isEmpty(param.getWeeklyId())){
                 throw new CoolException("鍙傛暟涓虹┖锛歐eeklyId");
-            } else if (Cools.isEmpty(param.getWeeklyType())){
-                throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDailyPlanList");
             } else if (Cools.isEmpty(param.getType())){
                 throw new CoolException("鍙傛暟涓虹┖锛歍ype");
             } else if (Cools.isEmpty(param.getWeeklyType())){
@@ -800,4 +798,82 @@
         }
         return R.ok("鍥為��鎴愬姛");
     }
+
+    @RequestMapping(value = "/weekly/from/add/phone/auth")
+    @ManagerAuth(memo = "鍛ㄨ鍒�/鏃ヨ鍒�/鏃ュ疄闄�")
+    @Transactional
+    public R formAddModifyPhone(@RequestBody WeeklyDomainParam param){
+        try{
+            if (Cools.isEmpty(param)){
+                throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDomainParam");
+            } else if (Cools.isEmpty(param.getWeeklyDailyRealityList()) || param.getWeeklyDailyRealityList().size()==0){
+                throw new CoolException("鍙傛暟涓虹┖锛歐eeklyDailyRealityList");
+            } else if (Cools.isEmpty(param.getWeeklyId())){
+                throw new CoolException("鍙傛暟涓虹┖锛歐eeklyId");
+//            } else if (Cools.isEmpty(param.getType())){
+//                throw new CoolException("鍙傛暟涓虹┖锛歍ype");
+            } else if (Cools.isEmpty(param.getWeeklyType())){
+                throw new CoolException("鍙傛暟涓虹┖锛歐eekly");
+            }
+            Date now = new Date();
+            Weekly weekly = weeklyService.selectById(param.getWeeklyId());
+            weekly.setUpdateBy(getUserId());
+            weekly.setUpdateTime(now);
+
+
+            List<Date> dateList = new ArrayList<>();//鑾峰彇鍛ㄤ竴涓庡懆鏃ユ棩鏈�
+            dateList = TimeCalculatorUtils.WeeklyMondayAndSundayNow(weekly.getStartTime());
+
+            List<Date> dates = TimeCalculatorUtils.WeeklyListDays(dateList);//鑾峰彇鍛ㄤ竴鍒板懆鏃ユ棩鏈�
+
+            try{
+                weeklyService.updateById(weekly);
+            } catch (Exception e) {
+                log.error("鏇存柊鍛ㄨ鍒掍富琛ㄥけ璐ワ紝寮傚父淇℃伅锛�"+e);
+                throw new CoolException("鏇存柊鍛ㄨ鍒掍富琛ㄥけ璐�");
+            }
+
+            List<CstmrUtilsParam> cstmrUtilsParamList = new ArrayList<>();
+            for (WeeklyDailyReality  weeklyDailyReality: param.getWeeklyDailyRealityList()){
+                Cstmr cstmr = null;
+                if (!Cools.isEmpty(weeklyDailyReality.getCstmrName())){
+                    cstmr = cstmrService.selectByName(getHostId(), weeklyDailyReality.getCstmrName());
+                    if(Cools.isEmpty(cstmr)){
+                        throw new CoolException("鏈煡璇㈠埌鐢叉柟鍗曚綅锛�");
+                    }else {
+                        weeklyDailyReality.setCstmrId(cstmr.getId());
+                    }
+                }
+                weeklyDailyReality.setHostId(getHostId());
+                weeklyDailyReality.setDeptId(getDeptId());               // 鎵�灞為儴闂�
+                weeklyDailyReality.setUserId(getUserId());               // 鎵�灞炰汉鍛�
+
+                weeklyDailyReality.setDirector(getUserId());               // 鎵�灞炰汉鍛�
+
+                weeklyDailyReality.setCreateBy(getUserId());
+                weeklyDailyReality.setCreateTime(now);
+                weeklyDailyReality.setUpdateBy(getUserId());
+                weeklyDailyReality.setUpdateTime(now);
+
+                weeklyDailyReality.setStatus(weekly.getStatus());
+
+                weeklyDailyReality.setDailyTime(dates.get(weeklyDailyReality.getWeeklyDay()-1));
+                weeklyDailyReality.setWeeklyId(weekly.getId());
+
+                try{
+                    weeklyDailyRealityService.insert(weeklyDailyReality);
+                } catch (Exception e){
+                    log.error("鏂板鏃ヨ鍒掑け璐�"+e);
+                    throw new CoolException("鏂板鏃ヨ鍒掑け璐�");
+                }
+
+            }
+
+        } catch (Exception e){
+            log.error("鏇存柊鍛ㄨ鍒掑紓甯革紝寮傚父淇℃伅锛�"+e);
+            throw new CoolException("鏇存柊鍛ㄨ鍒掑け璐�==>"+e);
+        }
+
+        return R.ok("鏇存柊鎴愬姛");
+    }
 }
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
index d2d9385..f02bd09 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyPlan.java
@@ -226,6 +226,13 @@
     private String town;
 
     /**
+     * 鐢叉柟鍗曚綅ID
+     */
+    @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+    @TableField("cstmr_name")
+    private String cstmrName;
+
+    /**
      * 璇︾粏鍦板潃
      */
     @ApiModelProperty(value= "璇︾粏鍦板潃")
diff --git a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
index 38e4339..aca4910 100644
--- a/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
+++ b/src/main/java/com/zy/crm/manager/entity/WeeklyDailyReality.java
@@ -218,6 +218,13 @@
     private Long cstmrId;
 
     /**
+     * 鐢叉柟鍗曚綅ID
+     */
+    @ApiModelProperty(value= "鐢叉柟鍗曚綅ID")
+    @TableField("cstmr_name")
+    private String cstmrName;
+
+    /**
      * 鏄熸湡
      */
     @ApiModelProperty(value= "鏄熸湡")
diff --git a/src/main/resources/mapper/WeeklyDailyPlanMapper.xml b/src/main/resources/mapper/WeeklyDailyPlanMapper.xml
index 602eac5..8fd2da6 100644
--- a/src/main/resources/mapper/WeeklyDailyPlanMapper.xml
+++ b/src/main/resources/mapper/WeeklyDailyPlanMapper.xml
@@ -32,6 +32,7 @@
         <result column="district" property="district" />
         <result column="town" property="town" />
         <result column="addr" property="addr" />
+        <result column="cstmr_name" property="cstmrName" />
 
     </resultMap>
 
diff --git a/src/main/resources/mapper/WeeklyDailyRealityMapper.xml b/src/main/resources/mapper/WeeklyDailyRealityMapper.xml
index 6575409..11f76e8 100644
--- a/src/main/resources/mapper/WeeklyDailyRealityMapper.xml
+++ b/src/main/resources/mapper/WeeklyDailyRealityMapper.xml
@@ -32,6 +32,7 @@
         <result column="district" property="district" />
         <result column="town" property="town" />
         <result column="addr" property="addr" />
+        <result column="cstmr_name" property="cstmrName" />
 
     </resultMap>
 

--
Gitblit v1.9.1