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

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

@@ -0,0 +1,86 @@
+package com.management.platform.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.management.platform.entity.SysForm;
+import com.management.platform.mapper.UserMapper;
+import com.management.platform.service.SysFormService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Priority;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@RestController
+@RequestMapping("/sys-form")
+public class SysFormController {
+    @Resource
+    private SysFormService sysFormService;
+    @Resource
+    private HttpServletRequest request;
+    @Resource
+    private UserMapper userMapper;
+
+
+    @RequestMapping("/list")
+    public HttpRespMsg list(){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysForm> list = sysFormService.list(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, companyId));
+        msg.setData(list);
+        return msg;
+    }
+
+    @RequestMapping("/getListByCode")
+    public HttpRespMsg getListByCode(@RequestParam String code){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        List<SysForm> sysFormList = sysFormService.list(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCompanyId, companyId).eq(SysForm::getCode, code));
+        msg.setData(sysFormList);
+        return msg;
+    }
+
+    @RequestMapping("addOrUpdate")
+    public HttpRespMsg addOrUpdate(SysForm sysForm){
+        HttpRespMsg msg=new HttpRespMsg();
+        Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
+        sysForm.setCompanyId(companyId);
+        Integer count;
+        if(sysForm.getId()==null){
+            count = sysFormService.count(new LambdaQueryWrapper<SysForm>().eq(SysForm::getCode, sysForm.getCode()).eq(SysForm::getName,sysForm.getName()).eq(SysForm::getCompanyId, companyId));
+        }else {
+            count = sysFormService.count(new LambdaQueryWrapper<SysForm>().ne(sysForm.getId()!=null,SysForm::getId, sysForm.getId()).eq(SysForm::getName,sysForm.getName()).eq(SysForm::getCode, sysForm.getCode()).eq(SysForm::getCompanyId, companyId));
+        }
+        if(count>0){
+            msg.setError("名称为["+sysForm.getName()+"]的自定义模板配置已存在");
+            return msg;
+        }
+        if(!sysFormService.saveOrUpdate(sysForm)){
+            msg.setError("验证失败");
+        };
+        return msg;
+    }
+
+    @RequestMapping("/delete")
+    public HttpRespMsg delete(Integer id){
+        HttpRespMsg msg=new HttpRespMsg();
+        if(!sysFormService.removeById(id)){
+            msg.setError("验证失败");
+        }
+        return msg;
+    }
+}
+

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

@@ -0,0 +1,70 @@
+package com.management.platform.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysForm extends Model<SysForm> {
+
+    private static final long serialVersionUID=1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 表单对应模块路由
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 模板名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 公司ID
+     */
+    @TableField("company_id")
+    private Integer companyId;
+
+    /**
+     * 配置详情
+     */
+    @TableField("config")
+    private String config;
+
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 是否为当前模板 0-否 1-是
+     */
+    @TableField("is_current")
+    private Integer isCurrent;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/mapper/SysFormMapper.java

@@ -0,0 +1,16 @@
+package com.management.platform.mapper;
+
+import com.management.platform.entity.SysForm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface SysFormMapper extends BaseMapper<SysForm> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.management.platform.service;
+
+import com.management.platform.entity.SysForm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+public interface SysFormService extends IService<SysForm> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.management.platform.service.impl;
+
+import com.management.platform.entity.SysForm;
+import com.management.platform.mapper.SysFormMapper;
+import com.management.platform.service.SysFormService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Seyason
+ * @since 2024-03-04
+ */
+@Service
+public class SysFormServiceImpl extends ServiceImpl<SysFormMapper, SysForm> implements SysFormService {
+
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.management.platform.mapper.SysFormMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.management.platform.entity.SysForm">
+        <id column="id" property="id" />
+        <result column="code" property="code" />
+        <result column="name" property="name" />
+        <result column="company_id" property="companyId" />
+        <result column="config" property="config" />
+        <result column="create_time" property="createTime" />
+        <result column="is_current" property="isCurrent" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, code, name, company_id, config, create_time, is_current
+    </sql>
+
+</mapper>

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

@@ -8283,7 +8283,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     break;
                 }
             }
-            item.put("userName",(String) map.get("name"));
+            item.put("userName",(String) map.get("realName"));
             item.put("departmentName",departmentService.getSupDepartment(dept,departments));
             item.put("departmentId",dept.getCorpwxDeptid());
             item.put("projectCode",(String) map.get("projectCode"));

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -62,7 +62,7 @@
     </sql>
     <!--根据日期获取全部报告信息-->
     <select id="getAllReportByDate" resultType="java.util.Map">
-        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
+        SELECT a.id, c.name,uwb.name as realName,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime,a.is_dept_audit as isDeptAudit,a.group_audit_state as groupAuditState,task_group.incharger_id as inchargerId,a.project_audit_state as projectAuditState,a.audit_dept_managerid as deptAuditorName
@@ -75,6 +75,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
+        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
@@ -118,7 +119,7 @@
     </select>
 
     <select id="getAllReportByDateWithReportLog" resultType="java.util.Map">
-        SELECT a.id, c.name,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
+        SELECT a.id, c.name,uwb.name as realName,c.job_number as jobNumber,c.corpwx_userid as corpwxUserId,c.corpwx_deptid as corpwxDeptId, b.project_name AS project,b.project_code as projectCode,b.category_name as categoryName, a.working_time AS duration, a.content, a.create_time   AS time,a.create_date as createDate,
         a.state, a.time_type as timeType, a.cost, a.report_time_type as reportTimeType,a.start_time as startTime,u.job_number as jobNumber,
         a.end_time  as endTime, d.name as subProjectName,d.code as subProjectCode,a.task_id as taskId, task.name as taskName, a.is_overtime as isOvertime,a.progress as progress,
         a.department_audit_state as departmentAuditState, a.stage, a.pic_str as picStr, multi_worktime as multiWorktime,a.is_dept_audit as isDeptAudit,a.group_audit_state as groupAuditState,task_group.incharger_id as inchargerId,a.project_audit_state as projectAuditState,a.audit_dept_managerid as deptAuditorName
@@ -131,6 +132,7 @@
         JOIN project AS b ON a.project_id=b.id
         LEFT JOIN project_separate AS ps on b.id=ps.id
         LEFT JOIN user AS c ON a.creator_id=c.id
+        LEFT JOIN user_with_beisen AS uwb ON c.job_number=c.job_number
         left join sub_project as d on d.id = a.sub_project_id
         left join task on task.id = a.task_id
         left join report_extra_degree on report_extra_degree.id = a.degree_id
@@ -1063,8 +1065,9 @@
         ps.contract_code as contractCode,ps.project_category_sub as projectCategorySub,ps.region,DATE_FORMAT(p.create_date,'%Y-%m-%d') as createDate,DATE_FORMAT(ps.warranty_start_date,'%Y-%m-%d') as warrantyStartDate,
         DATE_FORMAT(ps.warranty_end_date,'%Y-%m-%d') as warrantyEndDate,DATE_FORMAT(p.finish_date,'%Y-%m-%d') as finishDate,ps.bu,IFNULL(p.man_day*8,0) as planTime,IFNULL(SUM(r.working_time),0) as realityTime,
         case  when p.man_day*8-SUM(r.working_time) &gt;= 0 then '否' else '是' end as isOver ,case when p.man_day*8-SUM(r.working_time) &gt; 0 then (p.man_day*8-SUM(r.working_time)) else '0' end as remaining,
-        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from participation pa
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',uwb.name)) from participation pa
         left join user u on pa.user_id=u.id
+        left join user_with_beisen uwb on u.job_number=uwb.job_number
         where pa.project_id=p.id ) as participations
         from project p
         left join project_main pm on p.project_main_id=pm.id
@@ -1096,12 +1099,14 @@
 
     <select id="getTaskGroupPlanTime" resultType="java.util.Map">
         select tg.project_id as projectId,tg.task_group_code as taskGroupCode,tg.name,tg.wbs_code as wbsCode,IFNULL(tg.man_day*8,0) as planTime,tg.id as groupId,
-        CONCAT(uu.job_number,'/',uu.name) as incahrgerName,
-        (select GROUP_CONCAT(CONCAT(u.job_number,'/',u.name)) from group_participator gp
+        CONCAT(uu.job_number,'/',uwb2.name) as incahrgerName,
+        (select GROUP_CONCAT(CONCAT(u.job_number,'/',uwb1.name)) from group_participator gp
         left join user u on gp.user_id=u.id
+        left join user_with_beisen uwb1 on u.job_number=uwb1.job_number
         where gp.group_id=tg.id ) as participations
         from task_group tg
         left join user uu on uu.id=tg.incharger_id
+        left join user_with_beisen uwb2 on uu.job_number=uwb2.job_number
         <where>
             tg.project_id in
             <foreach collection="list" open="(" close=")" separator="," item="item">