项目人天对接

八爪鱼公司来源修改
文件中心补充提交

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

@@ -349,10 +349,9 @@ public class ProjectDocumentController {
 
 
     @RequestMapping("/buildWithTemplate")
-    public HttpRespMsg buildWithTemplate(Integer templateId,Integer projectId){
+    public HttpRespMsg buildWithTemplate(Integer templateId,Integer projectId,Integer parentFid){
         User user = userMapper.selectById(request.getHeader("token"));
         List<ProDocumentTemDetail> proDocumentTemDetailList = proDocumentTemDetailMapper.selectList(new QueryWrapper<ProDocumentTemDetail>().eq("template_id", templateId));
-        List<ProDocumentTemDetail> collect = proDocumentTemDetailList.stream().filter(pl -> pl.getParentId() == null).collect(Collectors.toList());
         List<ProDocumentTemDetail> details = proDocumentTemDetailList.stream().filter(p -> p.getParentId() == null).collect(Collectors.toList());
         List<ProjectDocument> list=new ArrayList<>();
         details.forEach(dl->{
@@ -362,6 +361,7 @@ public class ProjectDocumentController {
             projectDocument.setIsFolder(1);
             projectDocument.setIndate(LocalDateTime.now());
             projectDocument.setProjectId(projectId);
+            projectDocument.setFolderId(parentFid);
             projectDocument.setIsDeleted(0);
             projectDocument.setCreatorId(user.getId());
             projectDocument.setCreatorName(user.getName());
@@ -374,22 +374,24 @@ public class ProjectDocumentController {
     }
     public void getParentFolders(List<ProjectDocument> projectDocumentList,List<ProDocumentTemDetail> proDocumentTemDetailList,Integer projectId,User user){
         List<ProjectDocument> list=new ArrayList<>();
-        for (ProjectDocument projectDocument : projectDocumentList) {
-            List<ProDocumentTemDetail> collect = proDocumentTemDetailList.stream().filter(pd -> pd.getParentId() != null && pd.getParentId().equals(projectDocument.getProDocumentTemDetailId())).collect(Collectors.toList());
-            collect.forEach(c->{
-                ProjectDocument item=new ProjectDocument();
-                item.setDocumentName(c.getName());
-                item.setLabel(c.getName());
-                item.setIsFolder(1);
-                item.setIndate(LocalDateTime.now());
-                item.setProjectId(projectId);
-                item.setIsDeleted(0);
-                item.setCreatorId(user.getId());
-                item.setCreatorName(user.getName());
-                item.setProDocumentTemDetailId(c.getId());
-                item.setFolderId(projectDocument.getProDocumentTemDetailId());
-                list.add(item);
-            });
+        if(projectDocumentList.size()>0){
+            for (ProjectDocument projectDocument : projectDocumentList) {
+                List<ProDocumentTemDetail> collect = proDocumentTemDetailList.stream().filter(pd -> pd.getParentId() != null && pd.getParentId().equals(projectDocument.getProDocumentTemDetailId())).collect(Collectors.toList());
+                collect.forEach(c->{
+                    ProjectDocument item=new ProjectDocument();
+                    item.setDocumentName(c.getName());
+                    item.setLabel(c.getName());
+                    item.setIsFolder(1);
+                    item.setIndate(LocalDateTime.now());
+                    item.setProjectId(projectId);
+                    item.setIsDeleted(0);
+                    item.setCreatorId(user.getId());
+                    item.setCreatorName(user.getName());
+                    item.setProDocumentTemDetailId(c.getId());
+                    item.setFolderId(projectDocument.getId());
+                    list.add(item);
+                });
+            }
             projectDocumentService.saveBatch(list);
             getParentFolders(list,proDocumentTemDetailList,projectId,user);
         }

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

@@ -907,6 +907,69 @@ public class ReportController {
             }
         }
 
+          if(company.getId()==862){
+            Collection<Integer> projectIds = reportList.stream().map(Report::getProjectId).distinct().collect(Collectors.toList());
+            List<Project> targetProjectList = projectList.stream().filter(pl -> projectIds.contains(pl.getId())).collect(Collectors.toList());
+            String creatorId = reportList.get(0).getCreatorId();
+            User reportUser = userMapper.selectById(creatorId);
+            DateTimeFormatter df=DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
+            LocalDateTime time = LocalDateTime.now();
+            String format = time.format(df);
+            String tokenOfYiWei = getTokenOfYiWei();
+            String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billApply";
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.add("token",tokenOfYiWei);
+            headers.add("Accept-Language","zh-CN");
+            JSONObject body=new JSONObject();
+            body.put("dataSource","工时管家");
+            body.put("type","EXPENSE");
+            body.put("applicant",reportUser.getName());
+            body.put("applyTime",format);
+            body.put("billNo","GS"+ reportUser.getId()+reportList.get(0).getCreateDate());
+            JSONArray expenseDetails=new JSONArray();
+            for (Report report : reportList) {
+                Optional<Project> first = targetProjectList.stream().filter(tl -> tl.getId().equals(report.getProjectId())).findFirst();
+                if(first.isPresent()){
+                    JSONObject expenseDetail =new JSONObject();
+                    expenseDetail.put("company","FONE");
+                    expenseDetail.put("department","DEFAULT");
+                    expenseDetail.put("project",first.get().getProjectCode());
+                    expenseDetail.put("expenseItem","DEFAULT");
+                    expenseDetail.put("amount",report.getWorkingTime());
+                    expenseDetails.add(expenseDetail);
+                }
+
+            }
+            body.put("expenseDetails",expenseDetails);
+            HttpEntity<String> requestEntity = new HttpEntity<String>(body.toJSONString(), headers);
+            ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
+                    HttpMethod.POST, requestEntity, String.class);
+            if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                String resp = responseEntity.getBody();
+                JSONObject json = JSONObject.parseObject(resp);
+                if(json.getIntValue("status")==0){
+                    JSONArray data = json.getJSONArray("data");
+                    JSONObject jsonObject = data.getJSONObject(0);
+                    Integer totalBudgetAmount = jsonObject.getInteger("totalBudgetAmount");
+                    Integer occurredBudgetAmount = jsonObject.getInteger("occurredBudgetAmount");
+                    BigDecimal divide = (new BigDecimal(occurredBudgetAmount).add(new BigDecimal(jsonObject.getInteger("amount")))).divide(new BigDecimal(totalBudgetAmount), 3, RoundingMode.HALF_UP);
+                    if(divide.doubleValue()>0.85){
+                        HttpRespMsg httpRespMsg=new HttpRespMsg();
+                        httpRespMsg.setMsg("当前预算占用已到85%");
+                    }
+                } else if(json.getIntValue("status")==14001){
+                    HttpRespMsg httpRespMsg=new HttpRespMsg();
+                    httpRespMsg.setError("当前项目预算不足，无法填报");
+                    return httpRespMsg;
+                }else if(json.getIntValue("status")==14002){
+                    HttpRespMsg httpRespMsg=new HttpRespMsg();
+                    httpRespMsg.setError("未找到预算控制单元:"+json.getString("message"));
+                    return httpRespMsg;
+                }
+            }
+        }
+
         //如果锁定工作时长上限的话，需要校验每日的合计工作时长
         if (comTimeType.getLockWorktime() == 1) {
             for (Report report : reportList) {

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

@@ -121,7 +121,9 @@ public interface ReportMapper extends BaseMapper<Report> {
 
     double getMyOvertime(String userId);
 
-    List<Map<String, Object>> getWaitingApproveCnt(Integer companyId);
+    List<Map<String, Object>> getProWaitingApproveCnt(Integer companyId);
+
+    List<Map<String, Object>> getDeptWaitingApproveCnt(Integer companyId);
 
     List<Map<String, Object>> getProjectCost(Integer companyId, List<Integer> projectIds);
 

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

@@ -7349,15 +7349,28 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<Integer> array = JSONArray.parseArray(projectIdArray, Integer.class);
         Integer integer = array.get(0);
         //校验项目归属
+        StringBuilder sb=new StringBuilder("批量删除项目:");
         Integer companyId = projectMapper.selectById(integer).getCompanyId();
+        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", array));
         if (companyId.intValue() != user.getCompanyId().intValue() || !user.getRoleName().equals("超级管理员")) {
             httpRespMsg.setError(MessageUtils.message("access.operationError"));
         } else {
             for (Integer id : array) {
                 System.out.println("删除项目id=="+id);
                 deleteProData(id);
+                Optional<Project> first = projectList.stream().filter(pl -> pl.getId().equals(id)).findFirst();
+                if(first.isPresent()){
+                    sb.append(first.get().getProjectName()+";");
+                }
             }
         }
+        OperationRecord operationRecord=new OperationRecord();
+        operationRecord.setCompanyId(companyId);
+        operationRecord.setOperatorName(user.getName());
+        operationRecord.setModuleName("项目管理");
+        operationRecord.setContent(sb.toString());
+        operationRecord.setOperationTime(LocalDateTime.now());
+        operationRecordService.save(operationRecord);
         return httpRespMsg;
     }
 
@@ -10119,22 +10132,24 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
     public void getParentFolders(List<ProjectDocument> projectDocumentList,List<ProDocumentTemDetail> proDocumentTemDetailList,Project project,User user){
         List<ProjectDocument> list=new ArrayList<>();
-        for (ProjectDocument projectDocument : projectDocumentList) {
-            List<ProDocumentTemDetail> collect = proDocumentTemDetailList.stream().filter(pd -> pd.getParentId() != null && pd.getParentId().equals(projectDocument.getProDocumentTemDetailId())).collect(Collectors.toList());
-            collect.forEach(c->{
-                ProjectDocument item=new ProjectDocument();
-                item.setDocumentName(c.getName());
-                item.setLabel(c.getName());
-                item.setIsFolder(1);
-                item.setIndate(LocalDateTime.now());
-                item.setProjectId(project.getId());
-                item.setIsDeleted(0);
-                item.setCreatorId(project.getCreatorId());
-                item.setCreatorName(user.getName());
-                item.setProDocumentTemDetailId(c.getId());
-                item.setFolderId(projectDocument.getProDocumentTemDetailId());
-                list.add(item);
-            });
+        if(projectDocumentList.size()>0){
+            for (ProjectDocument projectDocument : projectDocumentList) {
+                List<ProDocumentTemDetail> collect = proDocumentTemDetailList.stream().filter(pd -> pd.getParentId() != null && pd.getParentId().equals(projectDocument.getProDocumentTemDetailId())).collect(Collectors.toList());
+                collect.forEach(c->{
+                    ProjectDocument item=new ProjectDocument();
+                    item.setDocumentName(c.getName());
+                    item.setLabel(c.getName());
+                    item.setIsFolder(1);
+                    item.setIndate(LocalDateTime.now());
+                    item.setProjectId(project.getId());
+                    item.setIsDeleted(0);
+                    item.setCreatorId(project.getCreatorId());
+                    item.setCreatorName(user.getName());
+                    item.setProDocumentTemDetailId(c.getId());
+                    item.setFolderId(projectDocument.getId());
+                    list.add(item);
+                });
+            }
             projectDocumentService.saveBatch(list);
             getParentFolders(list,proDocumentTemDetailList,project,user);
         }

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

@@ -1117,6 +1117,25 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //删除日报的日志
             reportLogMapper.delete(new QueryWrapper<ReportLog>().eq("creator_id", userId).eq("create_date", date));
         }
+        if(company.getId()==862){
+            String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billRejected";
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.add("token",getTokenOfYiWei());
+            JSONObject body=new JSONObject();
+            body.put("type","EXPENSE");
+            body.put("billNo","GS"+reportList.get(0).getCreatorId()+reportList.get(0).getCreateDate());
+            HttpEntity<String> requestEntity = new HttpEntity<String>(body.toJSONString(), headers);
+            ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
+                    HttpMethod.POST, requestEntity, String.class);
+            if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                String resp = responseEntity.getBody();
+                JSONObject json = JSONObject.parseObject(resp);
+                if(json.getIntValue("status")==0){
+                    JSONArray jsonArray = json.getJSONArray("data");
+                }
+            }
+        }
         return httpRespMsg;
     }
 
@@ -1669,7 +1688,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 if (updateReportList.size() > 0) {
                     updateBatchById(updateReportList);
                 }
-/*                if(company.getId()==862){
+                if(company.getId()==862){
                     String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billApproved";
                     HttpHeaders headers = new HttpHeaders();
                     headers.setContentType(MediaType.APPLICATION_JSON);
@@ -1687,7 +1706,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             JSONArray jsonArray = json.getJSONArray("data");
                         }
                     }
-                }*/
+                }
             }else if(timeType.getReportAuditType() == 5){
                 List<Report> updateReportList = new ArrayList<>();
                 //项目所属BU审核
@@ -2180,7 +2199,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             }
             updateBatchById(newList);
         }
-/*        if(company.getId()==862){
+        if(company.getId()==862){
             String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billRejected";
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
@@ -2198,7 +2217,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     JSONArray jsonArray = json.getJSONArray("data");
                 }
             }
-        }*/
+        }
         List<Integer> collect = rList.stream().map(Report::getProjectId).collect(Collectors.toList());
         List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
         String pNames = projectList.stream().map(Project::getProjectName).collect(Collectors.joining(", ", "[", "]"));
@@ -3236,6 +3255,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(reportIds);
         int cnt = 0;
         List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "审核全员日报");
+        List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>().in("id", ids));
         for (Integer reportId : ids) {
             Report report = new Report();
             report.setState(3);//待提交，即草稿状态
@@ -3258,6 +3278,25 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             }
         }
+        if(user.getCompanyId()==862){
+            String url = "http://183.194.0.98:3202/api/web-server/controlCenter/billRejected";
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.add("token",getTokenOfYiWei());
+            JSONObject body=new JSONObject();
+            body.put("type","EXPENSE");
+            body.put("billNo","GS"+reportList.get(0).getCreatorId()+reportList.get(0).getCreateDate());
+            HttpEntity<String> requestEntity = new HttpEntity<String>(body.toJSONString(), headers);
+            ResponseEntity<String> responseEntity = this.restTemplate.exchange(url,
+                    HttpMethod.POST, requestEntity, String.class);
+            if (responseEntity.getStatusCode() == HttpStatus.OK) {
+                String resp = responseEntity.getBody();
+                JSONObject json = JSONObject.parseObject(resp);
+                if(json.getIntValue("status")==0){
+                    JSONArray jsonArray = json.getJSONArray("data");
+                }
+            }
+        }
         if (cnt == 0) {
             //msg.setError("只有待审核状态的报告才能撤回");
             msg.setError(MessageUtils.message("finance.revokeReport"));
@@ -4480,16 +4519,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 if(first.isPresent()){
                                     if(audit.getMsg().contains("提交了")){
                                         int i = audit.getMsg().indexOf("提");
-                                        String substring = audit.getMsg().substring(0, i + 1);
-                                        msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
+                                        String substring = audit.getMsg().substring(0, i);
+                                        msg = time+" " + audit.getMsg().replaceAll(substring,"\\$userName="+first.get().getCorpwxUserid()+"\\$");
                                     }else if(audit.getMsg().contains("审核通过了")){
                                         int i = audit.getMsg().indexOf("审");
-                                        String substring = audit.getMsg().substring(0, i + 1);
-                                        msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
+                                        String substring = audit.getMsg().substring(0, i);
+                                        msg = time+" " + audit.getMsg().replaceAll(substring,"\\$userName="+first.get().getCorpwxUserid()+"\\$");
                                     }else if(audit.getMsg().contains("驳回了")) {
                                         int i = audit.getMsg().indexOf("驳");
-                                        String substring = audit.getMsg().substring(0, i + 1);
-                                        msg = time+" " + audit.getMsg().replaceAll(substring,"$userName"+first.get().getCorpwxUserid()+"$");
+                                        String substring = audit.getMsg().substring(0, i);
+                                        msg = time+" " + audit.getMsg().replaceAll(substring,"\\$userName="+first.get().getCorpwxUserid()+"\\$");
                                     }
                                 }
                             }else {

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

@@ -704,13 +704,20 @@
     <select id="getMyOvertime"  resultType="java.lang.Double">
         select IFNULL(sum(overtime_hours),0) from report where creator_id=#{userId}
     </select>
-    <select id="getWaitingApproveCnt" resultType="java.util.HashMap">
+    <select id="getProWaitingApproveCnt" resultType="java.util.HashMap">
         select count(1) as num, user.dingding_userid as auditorDDId ,user.corpwx_userid as corpwxUserid from report
          left join user on user.id = project_auditor_id
          where state = 0 and project_audit_state = 0 and is_dept_audit = 0
         and report.company_id = #{companyId}
         group by project_auditor_id
     </select>
+    <select id="getDeptWaitingApproveCnt" resultType="java.util.HashMap">
+        select COUNT(1) as num, user.dingding_userid as auditorDDId ,user.corpwx_userid as corpwxUserid from report
+         left join user on user.id = audit_dept_managerid
+         where state = 0 and department_audit_state = 0 and is_dept_audit = 1
+        and report.company_id =#{companyId}
+        group by audit_dept_managerid
+    </select>
     <select id="getProjectCost" resultType="java.util.HashMap">
         SELECT project_id as projectId,basecost_id as basecostId, SUM(cost) AS cost FROM report WHERE company_id=#{companyId}
         AND (state = 0 or state = 1) and basecost_id > 0 AND project_id IN

fhKeeper/formulahousekeeper/octopus/src/views/market/list.vue

@@ -17,13 +17,7 @@
                     </template>
             </el-table-column>
             <el-table-column prop="companyName" label="公司名称"  ></el-table-column>
-            <el-table-column prop="wx_corpid" label="来源"  >
-                <template slot-scope="scope">
-                    <span>{{scope.row.wxCorpid!=null?"企业微信":""}}</span>
-                    <span>{{scope.row.dingdingCorpid!=null?"钉钉":""}}</span>
-                    <span>{{scope.row.wxCorpid==null&&scope.row.dingdingCorpid==null?"官网":""}}</span>
-                </template>
-            </el-table-column>
+            <el-table-column prop="regFrom" label="来源"  ></el-table-column>
             <el-table-column prop="cTime" label="注册时间"  ></el-table-column>
             <el-table-column prop="name" label="联系人" ></el-table-column>
             <el-table-column prop="phone" label="联系方式"  width="150"></el-table-column>

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/entity/VcompanyCustomerContact.java

@@ -17,7 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2022-05-12
+ * @since 2023-04-12
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -58,6 +58,12 @@ public class VcompanyCustomerContact extends Model<VcompanyCustomerContact> {
     @TableField("set_meal")
     private Integer setMeal;
 
+    /**
+     * 注册来源
+     */
+    @TableField("reg_from")
+    private String regFrom;
+
     /**
      * 名字
      */
@@ -65,7 +71,7 @@ public class VcompanyCustomerContact extends Model<VcompanyCustomerContact> {
     private String name;
 
     /**
-     * 手机号 登录账号
+     * 手机号 登录账号，全系统唯一
      */
     @TableField("phone")
     private String phone;

fhKeeper/formulahousekeeper/ops-platform/src/main/resources/mapper/VcompanyCustomerContactMapper.xml

@@ -9,6 +9,7 @@
         <result column="staff_count_max" property="staffCountMax" />
         <result column="expiration_date" property="expirationDate" />
         <result column="set_meal" property="setMeal" />
+        <result column="reg_from" property="regFrom" />
         <result column="name" property="name" />
         <result column="phone" property="phone" />
         <result column="contacted" property="contacted" />
@@ -21,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, company_name, staff_count_max, expiration_date, set_meal, name, phone, contacted, feedback, indate, c_time, wx_corpid, dingding_corpid
+        id, company_name, staff_count_max, expiration_date, set_meal, reg_from, name, phone, contacted, feedback, indate, c_time, wx_corpid, dingding_corpid
     </sql>
 
 </mapper>

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

@@ -6373,10 +6373,17 @@
                             this.listLoading = false;
                             this.submitingReport = false;
                             if (res.code == "ok") {
-                                this.$message({
+                                if(res.msg!=null){
+                                    this.$message({
+                                    message: res.msg,
+                                    type: "success"
+                                    });
+                                }else{
+                                    this.$message({
                                     message: this.isDraft==0?this.$t('message.submittedSuccessfully'):this.$t('message.Temporarysuccess'),
                                     type: "success"
-                                });
+                                    });
+                                }
                                 this.dialogVisible = false;
                                 this.jsDay = 0
                                 this.jsTime = 0

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -2065,7 +2065,11 @@ import timetoolVue from '../timetool/timetool.vue';
                         this.flgLg = true
                         if(res.code == "ok") {
                             this.$toast.clear();
-                            this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
+                            if(res.msg!=null){
+                                this.$toast.success(res.msg);                                    
+                            }else{
+                                this.$toast.success(this.isDraft==0?'提交成功':'暂存成功');
+                            }
                             this.$router.push("/index");
                         } else {
                             this.$toast.clear();