Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FinanceApiFallbackFactory.java

@@ -6,6 +6,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 会计服务降级处理
  * @author: 徐滕
@@ -25,6 +27,21 @@ public class FinanceApiFallbackFactory implements FallbackFactory<IFinanceApi> {
                 return null;
             }
 
+            @Override
+            public List<String> getCwProjectData() {
+                return null;
+            }
+
+            @Override
+            public List<String> getMembersId(String id) {
+                return null;
+            }
+
+            @Override
+            public void insertMembers(String projectId, String membersId) {
+
+            }
+
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IFinanceApi.java

@@ -3,8 +3,9 @@ package com.jeeplus.flowable.feign;
 import com.jeeplus.common.constant.AppNameConstants;
 import com.jeeplus.flowable.factory.AssessApiFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @author: 徐滕
@@ -19,4 +20,13 @@ public interface IFinanceApi {
      */
     @GetMapping(value = "/cwProjectReportArchive/getNotFiledYetList")
     String getNotFiledYetList();
+
+    @GetMapping(value = "/cwProjectRecords/getCwProjectData")
+    List<String> getCwProjectData();
+
+    @GetMapping(value = "/cwProjectRecords/getMembersId")
+    List<String> getMembersId(String id);
+
+    @RequestMapping(value = "/cwProjectRecords/insertMembers", method = RequestMethod.POST)
+    void insertMembers(String projectId,String membersId);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/controller/CwProjectRecordsController.java

@@ -44,6 +44,43 @@ public class CwProjectRecordsController {
 
     /**
      * 查询财务项目信息列表
+     * @return
+     */
+    @ApiLog("查询财务项目信息列表")
+    @GetMapping("getCwProjectData")
+    public List<String> getCwProjectData() throws Exception {
+        IPage<CwProjectRecordsDTO> result = new Page<CwProjectRecordsDTO>();
+        result = cwProjectRecordsService.findList (null,null);
+        List<String> idList = new ArrayList<>();
+        result.getRecords().forEach(re->{
+            idList.add(re.getId());
+        });
+        return idList;
+    }
+
+    /**
+     * 查询项目组成员id
+     * @return
+     */
+    @ApiLog("查询项目组成员id")
+    @GetMapping("getMembersId")
+    public List<String> getMembersId(String id) throws Exception {
+        List<String> idList = cwProjectRecordsService.getMembersId(id);
+        return idList;
+    }
+
+    /**
+     * 添加项目组成员
+     * @return
+     */
+    @ApiLog("添加项目组成员")
+    @GetMapping("insertMembers")
+    public void insertMembers(String projectId,String membersId) throws Exception {
+        cwProjectRecordsService.addMembers(projectId,membersId);
+    }
+
+    /**
+     * 查询财务项目信息列表
      * @param cwProjectRecordsDTO
      * @param page
      * @return

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -80,4 +80,11 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     List<CwProjectRecordsDTO> getReportById(@Param("id") String id, @Param("cwProjectRecordsDTO") CwProjectRecordsDTO cwProjectRecordsDTO);
 
     List<CwProjectRecordsDTO> getReportByProjectId(@Param("id") String id,@Param("projectId")String projectId);
+
+    /**
+     * 查询所有的项目组成员id
+     * @param id
+     * @return
+     */
+    List<String> getMembersId(String id);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -524,6 +524,13 @@
             and pr.id != #{id}
         </where>
     </select>
+    <select id="getMembersId" resultType="java.lang.String">
+        SELECT  id FROM cw_project_members
+        <where>
+            del_flag=0
+            and project_id = #{id}
+        </where>
+    </select>
 
 
 </mapper>

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -656,4 +656,34 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
         List<CwProjectRecordsDTO> projectList=cwProjectRecordsMapper.getReportByProjectId(id, projectId);
         return projectList;
     }
+
+    /**
+     * 查询所有的项目组成员id
+     * @param id
+     * @return
+     */
+    public List<String> getMembersId(String id) {
+        return cwProjectRecordsMapper.getMembersId(id);
+    }
+
+    /**
+     * 添加项目组成员信息
+     * @param projectId
+     * @param membersId
+     */
+    public void addMembers(String projectId, String membersId) {
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+
+        CwProjectMembers members = new CwProjectMembers();
+        members.setCreateById(userDTO.getId());
+        members.setCreateTime(new Date());
+        members.setUpdateById(userDTO.getId());
+        members.setUpdateTime(new Date());
+        members.setUserId(membersId);
+        members.setProjectId(projectId);
+        members.setStatus("0");
+        members.setIsImportant("1");
+
+        cwProjectMembersService.save(members);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/service/HandoverRecoveryService.java

@@ -147,9 +147,9 @@ public class HandoverRecoveryService extends ServiceImpl<HandoverRecoveryMapper,
             Map<String ,String > map = new HashMap<>();
 
             map.put("taskId",uuid);
-            map.put("title","员工:" + handover.getName() +"离职提醒");
+            map.put("title","员工:" + handover.getName() +"已离职");
             map.put("defId",report.getId());
-            map.put("taskName","员工:" + handover.getName() +"离职提醒");
+            map.put("taskName","员工:" + handover.getName() +"已离职");
             map.put("createUser",userDTO.getLoginName());
             map.put("createTime",day);
             map.put("noticeName",userName);

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/service/HandoverService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.TokenProvider;
+import com.jeeplus.flowable.feign.IFinanceApi;
 import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.human.depart.handover.domain.*;
 import com.jeeplus.human.depart.handover.mapper.HandoverMapper;
@@ -161,7 +162,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
             String procDefKey = map.get("key")+"";
             String businessTable = "human_resources_depart_handover_draft";
             String businessId = uid;
-            String title = "底稿归档检查";
+            String title = report.getName() + "-离职申请-底稿归档检查";
             String assignee = report.getDraftAdministrator();
             String recordType = "";
             String userId = report.getCreateById();
@@ -294,6 +295,22 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
             handoverImprestService.saveOrUpdate(handoverImprest);
 
             SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
+
+            //将交接人添加到离职人员所有项目的项目组中
+            //查出所有的项目id
+            List<String> ids = SpringUtil.getBean(IFinanceApi.class).getCwProjectData();
+
+            ids.forEach(id->{
+                //根据id查出项目组成员信息
+                List<String> membersIdList = SpringUtil.getBean(IFinanceApi.class).getMembersId(id);
+                if (!membersIdList.contains(report.getProjectManager())) {
+                    //将这个项目经理加入到项目组成员中
+                    SpringUtil.getBean(IFinanceApi.class).insertMembers(id,report.getProjectManager());
+                }
+            });
+
+
+
         }
 
         return report;

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentRegistrationMapper.xml

@@ -39,7 +39,8 @@
         a.process_definition_id,
         a.user_id,
         a.project_manager,
-        a.remarks
+        a.remarks,
+        a.on_job_status
     </sql>
     <update id="updateStatusById">
         UPDATE human_resources_enrollment_registration SET type = #{type}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -253,7 +253,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(dto);
 
 
-                report.setOnJobStatus("正式");
+//                report.setOnJobStatus("正式");
                 //发送短信通知 (未实现)
 
                 PostDTO postDTO = SpringUtil.getBean(IPostApi.class).getPostDTOByName("门卡管理员");

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/domain/ReimburseRegister.java

@@ -65,6 +65,9 @@ public class ReimburseRegister extends BaseEntity {
     private String createName;
 
     @TableField(exist = false)
+    private String mobilePhone;
+
+    @TableField(exist = false)
     private String[] amounts;
 
     @TableField(exist = false)

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/mapper/xml/ReimburseRegisterMapper.xml

@@ -45,9 +45,12 @@
     <select id="getById" resultType="com.jeeplus.human.practice.reimburseRegister.domain.ReimburseRegister">
         select
         <include refid="Base_Column_List"></include>,
-        d.ID_ AS task_id
+        d.ID_ AS task_id,
+        su.name as createName,
+        su.mobile as mobilePhone
         from human_resources_practice_reimburse_register a
         LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
+        sys_user su on a.create_by_id = su.id
         where a.id = #{id} and a.del_flag = '0'
     </select>
 </mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/service/ReimburseRegisterService.java

@@ -23,8 +23,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 /**
@@ -55,8 +57,8 @@ public class ReimburseRegisterService extends ServiceImpl<ReimburseRegisterMappe
         if (StringUtils.isNotEmpty(registration.getId())){
 
             ReimburseRegister report = registerMapper.getById(registration.getId());
-            registration.setCreateById(report.getCreateById());
             if (report != null){
+                registration.setCreateById(report.getCreateById());
                 return update(registration);
             }
         }
@@ -209,7 +211,26 @@ public class ReimburseRegisterService extends ServiceImpl<ReimburseRegisterMappe
                         registrationService.updatePracticeStatus(report.getCreateById(),endTime);
 
                         //系统账号冻结
-
+                        // 获取当前日期
+                        LocalDate currentDate = LocalDate.now();
+
+                        // 获取年、月、日
+                        int year = currentDate.getYear();
+                        int month = currentDate.getMonthValue();
+                        int day = currentDate.getDayOfMonth();
+
+                        //发送短信
+                        String randomCode = "你好" + report.getCreateName() + "！恭喜你完成在我司的实习，希望你今后工作生活顺利。系统将在" + year + "年"+ month + "月" + day + "日晚上12点冻结账号，请尽快" +
+                                "处理好手头的工作！";
+                        Map<String, Object> stringObjectMap = SpringUtil.getBean(IUserApi.class).sendRandomCodes(report.getMobilePhone(), randomCode);
+                        String statusCode = (String) stringObjectMap.get("statusCode");
+                        if (("000000").equals(statusCode)) {
+                            System.out.println("短信发送成功!");
+                        }else if(statusCode.equals("160040")){
+                            System.out.println("手机号获取验证码次数已达每日上限!");
+                        }else{
+                            System.out.println("短信发送失败，错误代码：101，请联系管理员!");
+                        }
                     }
                 }
             }

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java

@@ -74,27 +74,6 @@ public class SampleXxlJob {
         //如果没删除则删除
         for (RegistrationInfo info : infos){
             SpringUtil.getBean(IUserApi.class).deleteById(info.getUserId());
-
-            // 获取当前日期
-            LocalDate currentDate = LocalDate.now();
-
-            // 获取年、月、日
-            int year = currentDate.getYear();
-            int month = currentDate.getMonthValue();
-            int day = currentDate.getDayOfMonth();
-
-            //发送短信
-            String randomCode = "你好" + info.getName() + "！恭喜你完成在我司的实习，希望你今后工作生活顺利。系统将在" + year + "年"+ month + "月" + day + "日晚上12点冻结账号，请尽快" +
-                    "处理好手头的工作！";
-            Map<String, Object> stringObjectMap = SpringUtil.getBean(IUserApi.class).sendRandomCodes(info.getMobilePhone(), randomCode);
-            String statusCode = (String) stringObjectMap.get("statusCode");
-            if (("000000").equals(statusCode)) {
-                System.out.println("短信发送成功!");
-            }else if(statusCode.equals("160040")){
-                System.out.println("手机号获取验证码次数已达每日上限!");
-            }else{
-                System.out.println("短信发送失败，错误代码：101，请联系管理员!");
-            }
         }
 
     }