代码调整

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -42,10 +42,10 @@
 			WHEN a.source_type = 4 THEN us4.name
 									ELSE us5.name END) AS name,
 			(CASE
-			WHEN a.source_type = 1 THEN b.`number`
-			WHEN a.source_type = 2 THEN b2.`number`
-			WHEN a.source_type = 4 THEN b4.`number`
-									ELSE b5.`number` END) AS `number`,
+			WHEN a.source_type = 1 THEN  trim(b.`number`)
+			WHEN a.source_type = 2 THEN trim(b2.`number`)
+			WHEN a.source_type = 4 THEN trim(b4.`number`)
+									ELSE trim(b5.`number`) END) AS `number`,
 			a.user_name,
 			a.reim_date,
 			a.type,

jeeplus-modules/jeeplus-finance/src/main/resources/application-finance.yml

@@ -1,2 +1,2 @@
-active: development
-#active: production
+#active: development
+active: production

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

@@ -359,7 +359,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
 
         //设置底稿管理员
 
-        PostDTO accountsRoleInfo = SpringUtil.getBean(IPostApi.class).getPostDTOByName("底稿管理员");
+        PostDTO accountsRoleInfo = SpringUtil.getBean(IPostApi.class).getPostDTOByName("底稿归档管理员");
         String accountsAssignee = getAssignee(accountsRoleInfo.getId());
         report.setDraftAdministrator(accountsAssignee);
 

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

@@ -308,7 +308,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 
                 String randomCode = report.getName() + "你好!欢迎入职" + officeName + "，请尽快登录公司系统:" + networkAddress
                         + "完善个人信息（包括社保卡号与工资卡号）并修改初始密码，系统初始账号密码为：" + report.getName() +
-                        "/123456，人事部门已在为你办理门禁卡，办理成功后将由系统告知，在收到系统通知后，请及时到办公室"+ listByPostId.get(0).getName() +"处领取门禁卡！"+
+                        "/123456，人事部门已在为你办理门禁卡，办理成功后将由系统告知，在收到系统通知后，请及时到信息部"+ listByPostId.get(0).getName() +"处领取门禁卡！"+
                         "注：工资卡需同时提供中信银行、招商银行卡号";
                 Map<String, Object> stringObjectMap = SpringUtil.getBean(IUserApi.class).sendRandomCodes(report.getMobilePhone(), randomCode);
                 String statusCode = (String) stringObjectMap.get("statusCode");
@@ -411,7 +411,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 //                UserDTO userInfo = SpringUtil.getBean(IUserApi.class).getByLoginNameNotTenantId("赵俐");
 //                String keyAssignee = userInfo.getId();
 
-                PostDTO postInfo = SpringUtil.getBean(IPostApi.class).getPostDTOByName("门卡办理人");
+                PostDTO postInfo = SpringUtil.getBean(IPostApi.class).getPostDTOByName("门卡管理员");
                 String keyAssignee = getAssignee2(postInfo.getId());
 
                 String keyRecordType = "";

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/logwrite/controller/RegistrationWorkLogController.java

@@ -46,7 +46,7 @@ public class RegistrationWorkLogController {
      * @return
      */
     @ApiLog("查询实习日志信息列表")
-    @PreAuthorize("hasAuthority('workLog:list')")
+    //@PreAuthorize("hasAuthority('workLog:list')")
     @GetMapping("list")
     public ResponseEntity<IPage<RegistrationWorkLogDto>> data(RegistrationWorkLogDto projectReportData, Page<RegistrationWorkLogDto> page) throws Exception {
         IPage<RegistrationWorkLogDto> result = new Page<RegistrationWorkLogDto>();

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/controller/ReimburseRegisterController.java

@@ -36,7 +36,7 @@ public class ReimburseRegisterController {
      * @return
      */
     @ApiLog("查询实习报销登记列表")
-    @PreAuthorize("hasAuthority('reimburseRegister:list')")
+    //@PreAuthorize("hasAuthority('reimburseRegister:list')")
     @GetMapping("list")
     public ResponseEntity<IPage<ReimburseRegister>> data(ReimburseRegister projectReportData, Page<ReimburseRegister> page) throws Exception {
         IPage<ReimburseRegister> result = new Page<ReimburseRegister>();

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/serialNumTpl/service/SerialnumTplService.java

@@ -188,6 +188,9 @@ public class SerialnumTplService {
                 throw new Exception("生成编号失败，请稍后重试");
             }
             String num = String.valueOf(numTpl.getSerialNum() + 1);
+            if(!year.equals(numTpl.getYearBuilt())){
+                num = "1";
+            }
             StringBuffer sb = new StringBuffer();
             sb.append(num);
             //查询公司简称