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

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

@@ -44,8 +44,8 @@ public class ContactsController {
     }
 
     @RequestMapping("selectContactsByCustomId")
-    public HttpRespMsg selectContactsByCustomId(@RequestBody Custom custom){
-        return contactsService.selectContactsByCustomId(custom);
+    public HttpRespMsg selectContactsByCustomId(@RequestBody Custom custom,HttpServletRequest request){
+        return contactsService.selectContactsByCustomId(custom,request);
     }
 
 }

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

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2024-03-06
+ * @since 2024-03-07
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -31,8 +31,8 @@ public class Task extends Model<Task> {
     /**
      * 任务名称
      */
-    @TableField("name")
-    private String name;
+    @TableField("task_name")
+    private String taskName;
 
     /**
      * 公司id

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

@@ -22,5 +22,5 @@ public interface ContactsService extends IService<Contacts> {
 
     HttpRespMsg pageContacts(Integer pageIndex, Integer pageSize, String customName, String name, String phone, String ownerName, HttpServletRequest request);
 
-    HttpRespMsg selectContactsByCustomId(Custom custom);
+    HttpRespMsg selectContactsByCustomId(Custom custom,HttpServletRequest request);
 }

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

@@ -58,7 +58,7 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
         }
         contacts.setCompanyId(companyId)
                 //todo:联系人的所有人是可选择的
-                .setOwnerId(user.getId())//添加时默认
+//                .setOwnerId(user.getId())//添加时默认
                 .setIsDelete(0)
                 .setCreateTime(LocalDateTime.now());
         int insert = contactsMapper.insert(contacts);
@@ -87,10 +87,12 @@ public class ContactsServiceImpl extends ServiceImpl<ContactsMapper, Contacts> i
     }
 
     @Override
-    public HttpRespMsg selectContactsByCustomId(Custom custom) {
+    public HttpRespMsg selectContactsByCustomId(Custom custom,HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
+        String token = String.valueOf(request.getHeader("Token"));
+        User user = userMapper.selectById(token);
         LambdaQueryWrapper<Contacts> contactsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        contactsLambdaQueryWrapper.eq(Contacts::getCustomId,custom.getId());
+        contactsLambdaQueryWrapper.eq(Contacts::getCustomId,custom.getId()).eq(Contacts::getCompanyId,user.getCompanyId());
         List<Contacts> contactsList = contactsMapper.selectList(contactsLambdaQueryWrapper);
         msg.setData(contactsList);
         return msg;

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

@@ -70,7 +70,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             return httpRespMsg;
         }
 
-        if (StringUtils.isEmpty(taskDto.getName())||taskDto.getPriority()==null){
+        if (StringUtils.isEmpty(taskDto.getTaskName())||taskDto.getPriority()==null){
             httpRespMsg.setError("缺少任务名称或任务优先级!");
             return httpRespMsg;
         }

fhKeeper/formulahousekeeper/management-crm/src/main/resources/mapper/TaskMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.Task">
         <id column="id" property="id" />
-        <result column="name" property="name" />
+        <result column="task_name" property="taskName" />
         <result column="company_id" property="companyId" />
         <result column="owner_id" property="ownerId" />
         <result column="contacts_id" property="contactsId" />
@@ -39,7 +39,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, product_id, status, priority, repeat, repeat_type, repeat_end_never, repeat_end_count, repeat_end_date, repeat_design_day, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, plate1, plate2, plate3, plate4, plate5
+        id, task_name, company_id, owner_id, contacts_id, executor_id, clue_id, custom_id, business_opportunity_id, order_id, product_id, status, priority, repeat, repeat_type, repeat_end_never, repeat_end_count, repeat_end_date, repeat_design_day, task_desc, creater_id, creater_name, create_date, end_date, start_date, finish_date, plate1, plate2, plate3, plate4, plate5
     </sql>
 
 </mapper>

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

@@ -1987,7 +1987,7 @@ public class ReportController {
      * @return
      */
     @RequestMapping("/getWorkDays")
-    public HttpRespMsg getWorkDays(String startDate, String endDate) {
+    public HttpRespMsg getWorkDays(String startDate, String endDate, String userId) {
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         if (token == null) {
@@ -2018,6 +2018,20 @@ public class ReportController {
                     //msg.setError("日期间隔不得超过365天");
                     msg.setError(MessageUtils.message("date.dateThan365"));
                 } else {
+                    //如果传了人，需要按照人员的入职离职日期来过滤
+                    if (userId != null) {
+                        User user = userService.getById(userId);
+                        if (user != null) {
+                            LocalDate entryDate = user.getInductionDate();
+                            LocalDate leaveDate = user.getInactiveDate();
+                            if (entryDate != null && entryDate.isAfter(localStartDate)) {
+                                startDate = dateTimeFormatter.format(entryDate);
+                            }
+                            if (user.getIsActive() == 0 && leaveDate != null && leaveDate.isBefore(localEndDate)) {
+                                endDate = dateTimeFormatter.format(leaveDate);
+                            }
+                        }
+                    }
                     msg.data = WorkDayCalculateUtils.getWorkDaysCountInRange(startDate, endDate, timeType.getIncludeWeekends());
                 }
             }

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

@@ -49,7 +49,6 @@ public class ProjectAddcostRecordServiceImpl extends ServiceImpl<ProjectAddcostR
 
     @Override
     public HttpRespMsg add(ProjectAddcostRecord item, String itemList) {
-        projectAddcostRecordMapper.insert(item);
         List<ProjectAddcostItem> list = JSONArray.parseArray(itemList, ProjectAddcostItem.class);
         List<ProjectCurrentcost> curList = projectCurrentcostMapper.selectList(new QueryWrapper<ProjectCurrentcost>().eq("project_id", item.getProjectId()));
         DecimalFormat df = new DecimalFormat("#.00");
@@ -74,6 +73,7 @@ public class ProjectAddcostRecordServiceImpl extends ServiceImpl<ProjectAddcostR
                 }
             }
         }
+        projectAddcostRecordMapper.insert(item);
         list.forEach(li->{
             li.setRecordId(item.getId());
             li.setProjectId(item.getProjectId());

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -3287,11 +3287,14 @@
                 if(this.isBatch == 0) {
                     return
                 }
-                
-                this.http.post('/report/getWorkDays',{ 
+                var reqParam = { 
                     startDate: this.workForm.createDate[0],
                     endDate: this.workForm.createDate[1]
-                },
+                };
+                if (this.isSubstitude && this.workForm.userId != null && this.workForm.userId.length>0) {
+                    reqParam.userId = this.workForm.userId[0];
+                }
+                this.http.post('/report/getWorkDays',reqParam,
                 res => {
                     if (res.code == "ok") {
                         this.jsDay = res.data

fhKeeper/formulahousekeeper/timesheet_h5/src/utils/index.js

@@ -1,5 +1,6 @@
 import {
-    Toast
+    Toast,
+    Dialog
 } from 'vant';
 
 export const loading = (flag) => {