Merge branch 'pre'

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -102,6 +102,7 @@ import com.xjrsoft.module.workflow.service.IWorkflowExecuteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 import org.camunda.bpm.engine.HistoryService;
 import org.camunda.bpm.engine.history.HistoricProcessInstance;
 import org.camunda.bpm.engine.history.HistoricProcessInstanceQuery;
@@ -215,7 +216,7 @@ public class UserController {
                     .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 2), UserDeptRelation::getDeptId, dto.getTreeId())
                     .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 3), BaseStudentSchoolRoll::getGradeId, dto.getTreeId())
                     .eq((ObjectUtil.isNotNull(dto.getTreeType()) && dto.getTreeType() == 4), BaseStudentSchoolRoll::getClassId, dto.getTreeId())
-                    .eq(ObjectUtil.isNotNull(dto.getUserType()), Role::getId, dto.getUserType())
+                    .eq(ObjectUtils.isNotEmpty(dto.getUserType()) && dto.getUserType() != 0, Role::getId, dto.getUserType())
                     .eq(ObjectUtil.isNotNull(dto.getEmployType()), BaseTeacher::getEmployType, dto.getEmployType())
                     .eq(ObjectUtil.isNotNull(dto.getEmployWay()), BaseTeacher::getEmployWay, dto.getEmployWay())
                     .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseStudentSchoolRoll::getClassId, dto.getClassId())

src/main/java/com/xjrsoft/module/personnel/service/impl/BasePersonnelLabourCapitalServiceImpl.java

@@ -38,11 +38,7 @@ import javax.validation.Valid;
 import java.io.ByteArrayOutputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -122,6 +118,7 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean importSocialSecurityData(AddBasePersonnelLabourCapitalDto dto, List<Map<Integer, Object>> excelDataList) throws ParseException {
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -132,7 +129,10 @@ public class BasePersonnelLabourCapitalServiceImpl extends MPJBaseServiceImpl<Ba
         basePersonnelLabourCapital.setIdNumberColumn(1);
         basePersonnelLabourCapital.setJobNumberColumn(2);
         basePersonnelLabourCapital.setDateOfIssue(sdf.parse(dto.getDateOfIssue()));
-        basePersonnelLabourCapital.setYear(basePersonnelLabourCapital.getDateOfIssue().getYear());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(basePersonnelLabourCapital.getDateOfIssue());
+        int year = calendar.get(Calendar.YEAR);
+        basePersonnelLabourCapital.setYear(year);
 
         List<BasePersonnelLabourCapitalTitle> titleList = initTitleList(excelDataList.get(0), new LinkedHashMap<>(), basePersonnelLabourCapital);
         List<BasePersonnelLabourCapitalData> dataList = initDataList(dto, excelDataList, 1);

src/main/java/com/xjrsoft/module/textbook/service/impl/WfTextbookSubscriptionServiceImpl.java

@@ -61,8 +61,6 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
 
     private final WfTextbookSubscriptionItemMapper wfTextbookSubscriptionWfTextbookSubscriptionItemMapper;
 
-    private final TextbookSubscriptionRecordMapper textbookTextbookSubscriptionRecordMapper;
-
     private final WfTextbookSubscriptionItemHistoryMapper wfTextbookSubscriptionItemHistoryMapper;
 
     private final TextbookSubscriptionMapper textbookSubscriptionMapper;
@@ -81,7 +79,9 @@ public class WfTextbookSubscriptionServiceImpl extends MPJBaseServiceImpl<WfText
         // 处理征订表
         int sum = 0;
         for (TextbookSubscriptionItem textbookSubscriptionItem : textbookSubscription.getTextbookSubscriptionItemList()) {
-            sum += textbookSubscriptionItem.getStudentNum() + textbookSubscriptionItem.getTeacherNum();
+            sum += (ObjectUtils.isNotEmpty(textbookSubscriptionItem.getStudentNum()) ? textbookSubscriptionItem.getStudentNum() : 0)
+                    + (ObjectUtils.isNotEmpty(textbookSubscriptionItem.getTeacherNum()) ? textbookSubscriptionItem.getTeacherNum() : 0)
+                    ;
         }
         textbookSubscriptionMapper.insert(textbookSubscription);
 

src/main/java/com/xjrsoft/module/veb/util/ImportExcelUtil.java

@@ -1,6 +1,5 @@
 package com.xjrsoft.module.veb.util;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,7 +18,6 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import javax.naming.directory.InvalidAttributesException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -31,7 +29,7 @@ import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 /**
- * @author dzx
+ * @author phoenix
  * @Description 导入工具类
  * 2023/12/5
  */

src/main/resources/sqlScript/update_sql.sql

@@ -4,3 +4,10 @@
 -- ----------------------------
 alter table xjr_oa_news_relation
     modify reply_content varchar(256) null comment '回复内容';
+
+
+
+
+alter table textbook_subscription
+    modify base_class_ids longtext null comment '按班级征订征订的班级主键(base_class)';
+

src/main/resources/sqlScript/views_sql.sql

@@ -68,7 +68,7 @@ select 1001                                                    AS `pk_corp`,
             else '其他' end)                                   AS `state`,
        NULL                                                    AS `Userdef2`,
        NULL                                                    AS `Userdef1`,
-       NULL                                                    AS `Resourcecode`,
+       t10.name                                                    AS `Resourcecode`,
        NULL                                                    AS `Birthday`,
        NULL                                                    AS `Account`,
        NULL                                                    AS `bank`,
@@ -85,6 +85,7 @@ from `smart_campus`.`base_student` `t`
          left join `smart_campus`.`base_major_set` `t7` on `t7`.`id` = `t2`.`major_set_id`
          left join `smart_campus`.`base_student_graduate` `t8` on `t8`.`user_id` = `t1`.`id`
          left join `smart_campus`.`xjr_dictionary_detail` `t9` on `t9`.`code` = `t2`.`stduy_status`
+         left join `smart_campus`.`xjr_dictionary_detail` `t10` on `t10`.`code` = `t2`.`student_type`
 where t.delete_mark = 0
   and t1.delete_mark = 0
   and t2.delete_mark = 0