代码调整

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -37,6 +37,7 @@
 			WHEN a.source_type = 2 THEN contr2.contract_name
 			WHEN a.source_type = 3 THEN p3.project_name
 			WHEN a.source_type = 4 THEN b4.project_name
+			WHEN a.source_type = 6 THEN b6.reimbuser_name
 									ELSE b5.project_name END) AS project_name,
 			(CASE
 			WHEN a.source_type = 1 THEN b.report_number

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

@@ -61,6 +61,7 @@ public class HandoverAccountsService extends ServiceImpl<HandoverAccountsMapper,
             HandoverAccounts report = accountsMapper.getById(accounts.getId());
             if (report != null){
                 accounts.setCreateById(report.getCreateById());
+                accounts.setName(report.getName());
                 return update(accounts);
             }
         }
@@ -118,7 +119,7 @@ public class HandoverAccountsService extends ServiceImpl<HandoverAccountsMapper,
                 String procDefKey = map.get("key")+"";
                 String businessTable = "human_resources_depart_handover_recovery";
                 String businessId = uid;
-                String title = "门卡回收";
+                String title = report.getName() + "-离职-门卡回收";
                 String assignee = report.getCreateById();
                 String recordType = "";
                 Map<String,String> newMap = new HashMap();

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

@@ -64,6 +64,7 @@ public class HandoverComputerService extends ServiceImpl<HandoverComputerMapper,
             HandoverComputer report = computerMapper.getById(computer.getId());
             if (report != null){
                 computer.setCreateById(report.getCreateById());
+                computer.setName(report.getName());
                 return update(computer);
             }
         }
@@ -121,7 +122,7 @@ public class HandoverComputerService extends ServiceImpl<HandoverComputerMapper,
                 String procDefKey = map.get("key")+"";
                 String businessTable = "human_resources_depart_handover_recovery";
                 String businessId = uid;
-                String title = "门卡回收";
+                String title = report.getName() + "-离职-门卡回收";
                 String assignee = report.getCreateById();
                 String recordType = "";
                 Map<String,String> newMap = new HashMap();

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

@@ -67,6 +67,7 @@ public class HandoverDraftService extends ServiceImpl<HandoverDraftMapper, Hando
             HandoverDraft report = draftMapper.getById(draft.getId());
             if (report != null){
                 draft.setCreateById(report.getCreateById());
+                draft.setName(report.getName());
                 return update(draft);
             }
         }
@@ -124,7 +125,7 @@ public class HandoverDraftService extends ServiceImpl<HandoverDraftMapper, Hando
                 String procDefKey = map.get("key")+"";
                 String businessTable = "human_resources_depart_handover_recovery";
                 String businessId = uid;
-                String title = "门卡回收";
+                String title = report.getName() + "-离职-门卡回收";
                 String assignee = report.getCreateById();
                 String recordType = "";
                 Map<String,String> newMap = new HashMap();

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

@@ -63,6 +63,7 @@ public class HandoverImprestService extends ServiceImpl<HandoverImprestMapper, H
             HandoverImprest report = imprestMapper.getById(accounts.getId());
             if (report != null){
                 accounts.setCreateById(report.getCreateById());
+                accounts.setName(report.getName());
                 return update(accounts);
             }
         }
@@ -120,7 +121,7 @@ public class HandoverImprestService extends ServiceImpl<HandoverImprestMapper, H
                 String procDefKey = map.get("key")+"";
                 String businessTable = "human_resources_depart_handover_recovery";
                 String businessId = uid;
-                String title = "门卡回收";
+                String title = report.getName() + "-离职-门卡回收";
                 String assignee = report.getCreateById();
                 String recordType = "";
                 Map<String,String> newMap = new HashMap();

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

@@ -65,6 +65,7 @@ public class HandoverSocialSecurityService extends ServiceImpl<HandoverSocialSec
             HandoverSocialSecurity report = socialSecurityMapper.getById(accounts.getId());
             if (report != null){
                 accounts.setCreateById(report.getCreateById());
+                accounts.setName(report.getName());
                 return update(accounts);
             }
         }
@@ -122,7 +123,7 @@ public class HandoverSocialSecurityService extends ServiceImpl<HandoverSocialSec
                 String procDefKey = map.get("key")+"";
                 String businessTable = "human_resources_depart_handover_recovery";
                 String businessId = uid;
-                String title = "门卡回收";
+                String title = report.getName() + "-离职-门卡回收";
                 String assignee = report.getCreateById();
                 String recordType = "";
                 Map<String,String> newMap = new HashMap();

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/controller/DepartRegistrationController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.Date;
 
 /**
  * @author 王强
@@ -112,4 +113,16 @@ public class DepartRegistrationController {
         Boolean s = departService.selectComplete();
         return ResponseEntity.ok(s);
     }
+
+    /**
+     * 查询入职日期
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "查询是否有已完成的流程数据")
+    @GetMapping("/selectContractStartDate")
+    public ResponseEntity<String> selectContractStartDate(){
+        String date = departService.selectContractStartDate();
+        return ResponseEntity.ok(date);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/mapper/DepartMapper.java

@@ -11,6 +11,8 @@ import com.jeeplus.human.practice.register.domain.Registration;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+
 /**
  * @author 王强
  * @version 1.0
@@ -32,4 +34,11 @@ public interface DepartMapper extends BaseMapper<DepartRegistration> {
     void updateStatusById(@Param("id") String id, @Param("type") String type);
 
     DepartRegistration getByHandoverId(@Param("handoverId") String handoverId);
+
+    /**
+     * 查询入职时间
+     * @return
+     * @param id
+     */
+    String selectContractStartDate(@Param("id") String id);
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/mapper/xml/DepartMapper.xml

@@ -140,5 +140,8 @@
         </where>
         ORDER BY a.create_time DESC
     </select>
+    <select id="selectContractStartDate" resultType="java.lang.String">
+        select contract_start_date from human_resources_enrollment_registration where user_id = #{id} and del_flag = '0'
+    </select>
 
 </mapper>

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/service/DepartService.java

@@ -141,7 +141,6 @@ public class DepartService extends ServiceImpl<DepartMapper, DepartRegistration>
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
         QueryWrapper<DepartRegistration> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("create_by_id",userDTO.getId());
-        queryWrapper.eq("type","5");
         queryWrapper.eq("del_flag","0");
         Integer integer = mapper.selectCount(queryWrapper);
         if (integer == 0) {
@@ -156,4 +155,9 @@ public class DepartService extends ServiceImpl<DepartMapper, DepartRegistration>
         DepartRegistration info = mapper.getByHandoverId(handoverId);
         return info;
     }
+
+    public String selectContractStartDate() {
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+        return mapper.selectContractStartDate(userDTO.getId());
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentRegistration.java

@@ -62,4 +62,21 @@ public class EnrollmentRegistration extends BaseEntity {
     private String onJobStatus;       //在职状态
     @TableField(exist = false)
     private String departmentName;       //所属部门名称
+
+    @TableField(exist = false)
+    private String zxBankCardNumber;        //银行卡号
+    @TableField(exist = false)
+    private String zxAccountHolder;
+    @TableField(exist = false)
+    private String accountHolderFront;
+    @TableField(exist = false)
+    private String accountHolderOpposite;
+    @TableField(exist = false)
+    private String gsBankCardNumber;
+    @TableField(exist = false)
+    private String gsAccountHolder;
+    @TableField(exist = false)
+    private String gsAccountHolderFront;
+    @TableField(exist = false)
+    private String gsAccountHolderOpposite;
 }

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

@@ -83,9 +83,18 @@
         b.social_security_number,
         b.social_security_bank_number,
         b.social_security_picture_front,
-        b.social_security_picture_opposite as socialSecurityPictureOpposite
+        b.social_security_picture_opposite as socialSecurityPictureOpposite,
+        c.zx_bank_card_number as zxBankCardNumber,
+        c.zx_account_holder as zxAccountHolder,
+        c.account_holder_front as accountHolderFront,
+        c.account_holder_opposite as accountHolderOpposite,
+        c.gs_bank_card_number as gsBankCardNumber,
+        c.gs_account_holder as gsAccountHolder,
+        c.gs_account_holder_front as gsAccountHolderFront,
+        c.gs_account_holder_opposite as gsAccountHolderOpposite
         from human_resources_enrollment_registration a
         left join human_resources_enrollment_social_security_card b on a.id = b.enrollment_registration_id and b.del_flag = '0'
+        left join human_resources_enrollment_wage_card c on a.id = c.enrollment_registration_id and c.del_flag = '0'
         where a.id = #{id} and a.del_flag = '0'
     </select>
     <select id="getFormalUserInfo"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/domain/RegistrationBank.java

@@ -22,5 +22,7 @@ public class RegistrationBank extends BaseEntity {
     private String registerId;      //实习登记表id
     private String userId;
     private String name;
+    private String accountHolderFront;      //银行卡正面
+    private String accountHolderOpposite;
 
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/mapper/xml/RegistrationBankMapper.xml

@@ -17,7 +17,9 @@
         a.bank_card_number,
         a.remarks,
         a.user_id,
-        a.name
+        a.name,
+        a.account_holder_front,
+        a.account_holder_opposite
     </sql>
     <update id="updateStatusById">
         UPDATE human_resources_practice_registration_bank SET type = #{type}

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -237,7 +237,7 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
                     System.out.println("短信发送失败，错误代码：101，请联系管理员!");
                 }
 
-                report.setPracticeStatus("实习中");
+                report.setPracticeStatus("0");
                 report.setUserId(dto.getId());
 
                 //发送完善工资卡信息  实习生完善银行卡号

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

@@ -16,10 +16,10 @@ import org.apache.ibatis.annotations.Param;
  * @date 2023-09-19 13:40
  */
 @Mapper
-@InterceptorIgnore(tenantLine = "true")
 public interface ReimburseRegisterMapper extends BaseMapper<ReimburseRegister> {
 
     IPage<ReimburseRegister> findList(Page<ReimburseRegister> page,@Param(Constants.WRAPPER) QueryWrapper<ReimburseRegister> queryWrapper);
+    @InterceptorIgnore(tenantLine = "true")
     IPage<ReimburseRegister> findList2(Page<ReimburseRegister> page,@Param(Constants.WRAPPER) QueryWrapper<ReimburseRegister> queryWrapper);
 
     ReimburseRegister getById(String id);

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

@@ -69,7 +69,7 @@
         and a.id not in (
         select DISTINCT a.human_reimburse_register_id from human_reimbursement_detail_info_procured a
         LEFT JOIN cw_reimbursement_info b on a.info_id = b.id
-        WHERE a.del_flag = '0' and b.type = '5'
+        WHERE a.del_flag = '0' and b.del_flag = '0' and a.human_reimburse_register_id is not NULL
         )
         ORDER BY a.create_time DESC
     </select>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/collect/mapper/CollectBasicMapper.java

@@ -37,4 +37,6 @@ public interface CollectBasicMapper extends BaseMapper<CollectBasic> {
      * @param id
      */
     void setCauseEmptyById(String id);
+
+    String getOfficeNameByOfficeId(String handledByOffice);
 }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/collect/mapper/xml/CollectBasicMapper.xml

@@ -63,6 +63,9 @@
 		from material_management_collect_basics_return
 		where basic_id = #{id}
 	</select>
+	<select id="getOfficeNameByOfficeId" resultType="java.lang.String">
+		select name from sys_office where id = #{handledByOffice}
+	</select>
 	<update id="setCauseEmptyById">
 		update material_management_collect_basics_return set remarks = null where id = #{id}
 	</update>

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/collect/service/CollectService.java

@@ -468,6 +468,9 @@ public class CollectService {
             }
             //根据经办人id查出经办人的名称
             String name = basicMapper.getUserNameByUserId(info.getHandledBy());
+            //根据经办人部门id查询经办人部门名称
+            String officeName = basicMapper.getOfficeNameByOfficeId(info.getHandledByOffice());
+            dto.setHandledByOfficeName(officeName);
             dto.setHandledBy(name);
             dto.setHandledById(info.getHandledBy());
             dto.setFiles(files);

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/calendar/controller/MyCalendarController.java

@@ -11,6 +11,7 @@ import com.jeeplus.calendar.service.dto.MyCalendarDTO;
 import com.jeeplus.calendar.service.mapstruct.MyCalendarWrapper;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
+import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -46,7 +47,8 @@ public class MyCalendarController {
     @ApiLog("查询日历")
     @GetMapping("queryById")
     public ResponseEntity queryById(String id) {
-        return ResponseEntity.ok ( myCalendarService.getById ( id ) );
+        MyCalendar myCalendar = myCalendarService.queryById(id);
+        return ResponseEntity.ok ( myCalendar );
     }
 
     /**
@@ -74,6 +76,11 @@ public class MyCalendarController {
     @PostMapping("save")
     public ResponseEntity save(@Valid @RequestBody MyCalendarDTO myCalendarDTO) {
         myCalendarDTO.setUserDTO ( UserUtils.getCurrentUserDTO ( ) );
+        if (null == myCalendarDTO.getUserDTO()) {
+            UserDTO userDTO = new UserDTO();
+            userDTO.setId(myCalendarDTO.getUserId());
+            myCalendarDTO.setUserDTO(userDTO);
+        }
         myCalendarService.saveOrUpdate ( myCalendarWrapper.toEntity ( myCalendarDTO ) );
         return ResponseEntity.ok ( "保存成功!" );
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/calendar/mapper/MyCalendarMapper.java

@@ -3,6 +3,7 @@
  */
 package com.jeeplus.calendar.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
@@ -19,8 +20,11 @@ import java.util.List;
  * @author liugf
  * @version 2021-06-11
  */
+@InterceptorIgnore(tenantLine = "true")
 public interface MyCalendarMapper extends BaseMapper <MyCalendar> {
 
+    @InterceptorIgnore(tenantLine = "true")
     List <MyCalendarDTO> findList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
+
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/calendar/service/MyCalendarService.java

@@ -31,4 +31,7 @@ public class MyCalendarService extends ServiceImpl <MyCalendarMapper, MyCalendar
     }
 
 
+    public MyCalendar queryById(String id) {
+        return baseMapper.selectById(id);
+    }
 }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/calendar/service/dto/MyCalendarDTO.java

@@ -22,6 +22,11 @@ public class MyCalendarDTO {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 移动端用
+     */
+    private String userId;
+
+    /**
      * 实体主键
      */
     private String id;