Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -99,7 +99,8 @@ public class SalesOrderController {
         AuditLogCenter auditLogCenter =new AuditLogCenter();
         auditLogCenter.setAuditorId(user.getId());
         auditLogCenter.setAuditorName(user.getName());
-        boolean isNew=true;
+        auditLogCenter.setModuleId(order.getId());
+        auditLogCenter.setModuleCode("SalesOrder");;
         if(order.getId()==null){
             auditLogCenter.setAuditorContent("创建了订单");
         }else {
@@ -108,14 +109,11 @@ public class SalesOrderController {
             String content = beanChangeUtil.contrastObj(oldOrder, order);
             //发生变化才生成记录
             if(!StringUtils.isEmpty(content.trim())){
-                isNew=false;
-                auditLogCenter.setModuleId(order.getId());
-                auditLogCenter.setModuleCode("SalesOrder");
                 auditLogCenter.setAuditorContent("编辑了订单");
-                auditLogCenterService.save(auditLogCenter);
             }
 
         }
+        auditLogCenterService.save(auditLogCenter);
         if(!salesOrderService.saveOrUpdate(order)){
             msg.setError("验证失败");
             return msg;
@@ -308,10 +306,17 @@ public class SalesOrderController {
         List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().eq(User::getCompanyId, companyId));
         List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getOrderId, id));
         taskList.forEach(p->{
-            Optional<User> user = userList.stream().filter(u -> u.getId().equals(p.getExecutorId())).findFirst();
-            if(user.isPresent()){
-                p.setExecutorName(user.get().getName());
+            String executorIds = p.getExecutorId();
+            String[] split = executorIds.split(",");
+            List<String> executorNameList=new ArrayList<>();
+            for (String s : split) {
+                Optional<User> user = userList.stream().filter(u -> u.getId().equals(s)).findFirst();
+                if(user.isPresent()){
+                    executorNameList.add(user.get().getName());
+                }
             }
+//            String collect = executorNameList.stream().map(i -> i).collect(Collectors.joining(","));
+            p.setExecutorNames(executorNameList);
         });
         msg.setData(taskList);
         return msg;
@@ -408,5 +413,72 @@ public class SalesOrderController {
     }
 
 
+    /**
+    * @Description:编辑回款数据
+    * @Param: [paymentId, money]
+    * @return: com.management.platform.util.HttpRespMsg
+    * @Author: yurk
+    * @Date: 2024/5/31
+    */
+    @RequestMapping("/editPayment")
+    public HttpRespMsg editPayment(Integer paymentId,Double money){
+        HttpRespMsg msg=new HttpRespMsg();
+        SalesOrderPayment payment = salesOrderPaymentService.getById(paymentId);
+        SalesOrder salesOrder = salesOrderService.getById(payment.getOrderId());
+        if(money!=null){
+            //找到原回款数据
+            BigDecimal nowMoney = new BigDecimal(money);
+            BigDecimal oldMoney = payment.getMoney();
+            nowMoney=nowMoney.subtract(oldMoney);
+            BigDecimal unReceivedPayment = payment.getUnReceivedPayment();
+            unReceivedPayment=unReceivedPayment.add(nowMoney);
+            payment.setMoney(new BigDecimal(money));
+            payment.setUnReceivedPayment(unReceivedPayment);
+            if(!salesOrderPaymentService.updateById(payment)){
+                msg.setError("验证失败");
+                return msg;
+            }
+            //订单上的已回款金额
+            BigDecimal receivedPayment = salesOrder.getReceivedPayment();
+            receivedPayment=receivedPayment.subtract(oldMoney).add(nowMoney);
+            salesOrder.setReceivedPayment(receivedPayment);
+            salesOrder.setUnReceivedPayment(unReceivedPayment);
+            if(!salesOrderService.updateById(salesOrder)){
+                msg.setError("验证失败");
+                return msg;
+            }
+        }
+       return msg;
+    }
+
+    /**
+    * @Description:删除回款数据
+    * @Param: [paymentId]
+    * @return: com.management.platform.util.HttpRespMsg
+    * @Author: yurk
+    * @Date: 2024/5/31
+    */
+    @RequestMapping("/deletePayment")
+    public HttpRespMsg deletePayment(Integer paymentId){
+        HttpRespMsg msg=new HttpRespMsg();
+        SalesOrderPayment payment = salesOrderPaymentService.getById(paymentId);
+        SalesOrder salesOrder = salesOrderService.getById(payment.getOrderId());
+        BigDecimal oldMoney = payment.getMoney();
+        //订单上的已回款金额
+        BigDecimal receivedPayment = salesOrder.getReceivedPayment();
+        receivedPayment=receivedPayment.subtract(oldMoney);
+        BigDecimal unReceivedPayment = salesOrder.getUnReceivedPayment();
+        unReceivedPayment=unReceivedPayment.add(oldMoney);
+        salesOrder.setReceivedPayment(receivedPayment);
+        salesOrder.setUnReceivedPayment(unReceivedPayment);
+        if(!salesOrderService.updateById(salesOrder)){
+            msg.setError("验证失败");
+            return msg;
+        }
+        salesOrderPaymentService.removeById(paymentId);
+        return msg;
+    }
+
+
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/SalesOrder.java

@@ -215,6 +215,12 @@ public class SalesOrder extends Model<SalesOrder> {
     @TableField(exist = false)
     private String creatorName;
 
+    @TableField(exist = false)
+    private String customSignerName;
+
+    @TableField(exist = false)
+    private String companySignerName;
+
     @TableField(exist = false)
     private String businessOpportunityName;
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/SalesOrderServiceImpl.java

@@ -196,6 +196,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
             if(incharger.isPresent()){
                 r.setInchargerName(incharger.get().getName());
             }
+            Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(r.getCompanySigner())).findFirst();
+            if(companySigner.isPresent()){
+                r.setCompanySignerName(companySigner.get().getName());
+            }
+            Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(r.getCustomSigner())).findFirst();
+            if(customSigner.isPresent()){
+                r.setCustomSignerName(customSigner.get().getName());
+            }
             Optional<SysDict> type = sysDictOfOrderType.stream().filter(s -> s.getId().equals(r.getType())).findFirst();
             if(type.isPresent()){
                 r.setTypeName(type.get().getName());
@@ -241,6 +249,14 @@ public class SalesOrderServiceImpl extends ServiceImpl<SalesOrderMapper, SalesOr
         if(incharger.isPresent()){
             salesOrder.setInchargerName(incharger.get().getName());
         }
+        Optional<User> companySigner = userList.stream().filter(u -> u.getId().equals(salesOrder.getCompanySigner())).findFirst();
+        if(companySigner.isPresent()){
+            salesOrder.setCompanySignerName(companySigner.get().getName());
+        }
+        Optional<User> customSigner = userList.stream().filter(u -> u.getId().equals(salesOrder.getCustomSigner())).findFirst();
+        if(customSigner.isPresent()){
+            salesOrder.setCustomSignerName(customSigner.get().getName());
+        }
         Optional<SysDict> type = sysDictOfOrderType.stream().filter(s -> s.getId().equals(salesOrder.getType())).findFirst();
         if(type.isPresent()){
             salesOrder.setTypeName(type.get().getName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserWithBeisenController.java

@@ -237,7 +237,7 @@ public class UserWithBeisenController {
                                 if(LocalDateTime.parse(o.getString("StartDate"),df1).toLocalDate().isEqual(LocalDateTime.parse(o.getString("StopDate"),df1).toLocalDate())){
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     //判断打卡时间是不是大于19:00 大于才算加班 通过打卡计算加班时长 与加班单作比较 取小
-                                    Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
+                                    Duration timeDurantion = Duration.between(LocalTime.parse(workDay?"18:00:00":"08:30:00", df4), max.get());
                                     BigDecimal decimal = new BigDecimal(timeDurantion.toMinutes());
                                     decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l = decimal.doubleValue();
@@ -255,7 +255,7 @@ public class UserWithBeisenController {
                                     decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l = decimal.doubleValue();
                                     //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
-                                    Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
+                                    Duration timeDurantion = Duration.between(LocalTime.parse(workDay?"18:00:00":"08:30:00", df4), max.get());
                                     BigDecimal decimal1 = new BigDecimal(timeDurantion.toMinutes());
                                     decimal1=decimal1.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l1 = decimal1.doubleValue();
@@ -270,7 +270,7 @@ public class UserWithBeisenController {
                                 if(LocalDateTime.parse(o.getString("StartDate"),df1).toLocalDate().isEqual(LocalDateTime.parse(o.getString("StopDate"),df1).toLocalDate())){
                                     //开始日期和结束日期是相同的情况 说明是加班区间只存在于当天的情况
                                     //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
-                                    Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
+                                    Duration timeDurantion = Duration.between(LocalTime.parse(workDay?"18:00:00":"08:30:00", df4), max.get());
                                     BigDecimal decimal = new BigDecimal(timeDurantion.toMinutes());
                                     decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l = decimal.doubleValue();
@@ -288,7 +288,7 @@ public class UserWithBeisenController {
                                     decimal=decimal.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l = decimal.doubleValue();
                                     //判断打卡时间是不是大于19:00 通过打卡计算加班时长 与加班单作比较 取小
-                                    Duration timeDurantion = Duration.between(LocalTime.parse("18:00:00", df4), max.get());
+                                    Duration timeDurantion = Duration.between(LocalTime.parse(workDay?"18:00:00":"08:30:00", df4), max.get());
                                     BigDecimal decimal1 = new BigDecimal(timeDurantion.toMinutes());
                                     decimal1=decimal1.divide(new BigDecimal(60),1,RoundingMode.HALF_UP);
                                     double l1 = decimal1.doubleValue();
@@ -402,7 +402,7 @@ public class UserWithBeisenController {
                     leaveSheet.setRemark(jsonObject.getString("Reason"));
                     leaveSheet.setStatus(jsonObject.getString("ApproveStatus").equals("通过")?0:jsonObject.getString("Reason").equals("审批中")?1:2);
                     leaveSheet.setProcinstId(jsonObject.getString("VacationId"));
-                    LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getEndDate, endDate));
+                    LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getEndDate, leaveSheet.getEndDate()));
                     if(one==null){
                         leaveSheetList.add(leaveSheet);
                     }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -2350,7 +2350,7 @@ public class TimingTask {
                     leaveSheet.setRemark(jsonObject.getString("Reason"));
                     leaveSheet.setStatus(jsonObject.getString("ApproveStatus").equals("通过")?0:jsonObject.getString("Reason").equals("审批中")?1:2);
                     leaveSheet.setProcinstId(jsonObject.getString("VacationId"));
-                    LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getEndDate, endDate));
+                    LeaveSheet one = leaveSheetService.getOne(new LambdaQueryWrapper<LeaveSheet>().eq(LeaveSheet::getOwnerId, first.get().getId()).eq(LeaveSheet::getStartDate, leaveSheet.getStartDate()).eq(LeaveSheet::getProcinstId,leaveSheet.getProcinstId()).eq(LeaveSheet::getEndDate, leaveSheet.getEndDate()));
                     if(one==null){
                         leaveSheetList.add(leaveSheet);
                     }