merge

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicCardRule.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -31,7 +32,7 @@ public class BasicCardRule extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicExamRule.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +31,7 @@ public class BasicExamRule extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicMessage.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -27,7 +28,7 @@ public class BasicMessage extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicStudent.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
@@ -46,6 +48,7 @@ public class BasicStudent extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "可操作人机构id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     public static long getSerialVersionUID() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicTemplate.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -31,7 +32,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicTemplateOrg.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -30,7 +31,7 @@ public class BasicTemplateOrg extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicVerifyCode.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class BasicVerifyCode extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientPrintData.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ClientPrintData extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientStatus.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ClientStatus extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamCard.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -32,7 +33,7 @@ public class ExamCard extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetail.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -31,7 +32,7 @@ public class ExamDetail extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamDetailCourse.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @JsonSerialize(using = ToStringSerializer.class)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPrintPlan.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -32,7 +33,7 @@ public class ExamPrintPlan extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamStudent.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ExamStudent extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @TableField("exam_detail_course_id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTask.java

@@ -34,7 +34,7 @@ public class ExamTask extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskPrint.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ExamTaskPrint extends BaseEntity implements Serializable {
     private Long schoolId;
 
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @JsonSerialize(using = ToStringSerializer.class)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamTaskTemp.java

@@ -1,5 +1,6 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -29,7 +30,7 @@ public class ExamTaskTemp extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TBSyncTask.java

@@ -29,7 +29,7 @@ public class TBSyncTask extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @ApiModelProperty(value = "第三方关联id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlow.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
@@ -28,6 +30,7 @@ public class TFFlow extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @ApiModelProperty(value = "流程名称")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowApprove.java

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -33,6 +34,7 @@ public class TFFlowApprove extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @ApiModelProperty(value = "流程id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowApproveLog.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
@@ -29,6 +31,7 @@ public class TFFlowApproveLog extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @ApiModelProperty(value = "流程id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowLog.java

@@ -1,5 +1,7 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
@@ -29,6 +31,7 @@ public class TFFlowLog extends BaseEntity implements Serializable {
 
     @ApiModelProperty(value = "机构id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
     private Long orgId;
 
     @ApiModelProperty(value = "流程id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicExamRuleService.java

@@ -17,5 +17,5 @@ public interface BasicExamRuleService extends IService<BasicExamRule> {
 
     BasicExamRule getBySchoolId(Long schoolId);
 
-    String saveExamRule(BasicExamRule examRule);
+    Long saveExamRule(BasicExamRule examRule);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicTemplateOrgService.java

@@ -22,7 +22,7 @@ public interface BasicTemplateOrgService extends IService<BasicTemplateOrg> {
 
     void removeByRuleId(Long id);
 
-    void saveBatch(TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
+    void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId);
 
     /**
      * 根据机构id查询所有机构集合下所使用的的模板信息

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCardRuleServiceImpl.java

@@ -120,7 +120,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
+        basicTemplateOrgService.saveBatch(schoolId,TemplateTypeEnum.CARD_RULE, cardRule.getId(), cardRule.getOrgIds(), cardRule.getCreateId());
 
         return isSuccess;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicExamRuleServiceImpl.java

@@ -49,16 +49,15 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
     }
 
     @Override
-    public String saveExamRule(BasicExamRule examRule) {
+    public Long saveExamRule(BasicExamRule examRule) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         examRule.setSchoolId(schoolId);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
         // 新增
         if (examRule.getId() == null) {
-            examRule.setId(SystemConstant.getDbUuid());
-            examRule.setCreateId(sysUser.getId());
-            examRule.setCreateTime(System.currentTimeMillis());
+            examRule.insertInfo(sysUser.getId());
+            examRule.setOrgId(sysUser.getOrgId());
             this.save(examRule);
         }
         // 修改
@@ -97,24 +96,23 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
                         throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改扩展字段");
                     }
                 }
-                if (!basicExamRule.getReview().equals(examRule.getReview())){
+                if (!basicExamRule.getReview().equals(examRule.getReview())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改入库审核控制");
                 }
-                if (!basicExamRule.getIncludePaper().equals(examRule.getIncludePaper())){
+                if (!basicExamRule.getIncludePaper().equals(examRule.getIncludePaper())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改包含试卷控制");
                 }
-                if (!basicExamRule.getCustomCard().equals(examRule.getCustomCard())){
+                if (!basicExamRule.getCustomCard().equals(examRule.getCustomCard())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改客服制卡控制");
                 }
-                if (!basicExamRule.getPrintMethod().equals(examRule.getPrintMethod())){
+                if (!basicExamRule.getPrintMethod().equals(examRule.getPrintMethod())) {
                     throw ExceptionResultEnum.ERROR.exception("有未结束的印刷计划，不能修改印刷方式控制");
                 }
             }
-            examRule.setUpdateId(sysUser.getId());
-            examRule.setUpdateTime(System.currentTimeMillis());
-
+            examRule.updateInfo(sysUser.getId());
+            examRule.setOrgId(sysUser.getOrgId());
             this.updateById(examRule);
         }
-        return examRule.getId().toString();
+        return examRule.getId();
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicStudentServiceImpl.java

@@ -9,14 +9,14 @@ import com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto;
 import com.qmth.distributed.print.business.bean.dto.excel.BasicStudentImportDto;
 import com.qmth.distributed.print.business.bean.params.BasicStudentParams;
 import com.qmth.distributed.print.business.bean.result.BasicStudentResult;
-import com.qmth.distributed.print.business.entity.BasicCampus;
 import com.qmth.distributed.print.business.entity.BasicStudent;
 import com.qmth.distributed.print.business.mapper.BasicStudentMapper;
-import com.qmth.distributed.print.business.service.BasicCampusService;
 import com.qmth.distributed.print.business.service.BasicStudentService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicCampus;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicCampusService;
 import com.qmth.teachcloud.common.service.TeachcloudCommonService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.beans.BeanUtils;
@@ -50,7 +50,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         queryParams = SystemConstant.translateSpecificSign(queryParams);
-        return basicStudentMapper.findBasicStudentPage(new Page<>(pageNumber,pageSize),queryParams,schoolId,orgIds);
+        return basicStudentMapper.findBasicStudentPage(new Page<>(pageNumber, pageSize), queryParams, schoolId, orgIds);
     }
 
     @Override
@@ -68,10 +68,10 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public Long saveBasicStudent(BasicStudentParams basicStudentParams,SysUser sysUser) {
+    public Long saveBasicStudent(BasicStudentParams basicStudentParams, SysUser sysUser) {
         List<BasicStudentParams> basicStudentParamsList = new ArrayList<>();
         basicStudentParamsList.add(basicStudentParams);
-        BasicStudent basicStudent = this.editEntityHelp(basicStudentParamsList,sysUser).get(0);
+        BasicStudent basicStudent = this.editEntityHelp(basicStudentParamsList, sysUser).get(0);
         this.saveOrUpdate(basicStudent);
         return basicStudent.getId();
     }
@@ -79,16 +79,16 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean removeBasicStudentBatch(List<Long> idList) {
-        if (idList.size() == 0){
+        if (idList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("请选择要删除的目标");
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         UpdateWrapper<BasicStudent> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda()
-                .set(BasicStudent::getEnable,false)
-                .set(BasicStudent::getOrgId,sysUser.getOrgId())
-                .set(BasicStudent::getUpdateId,sysUser.getId())
-                .in(BasicStudent::getId,idList);
+                .set(BasicStudent::getEnable, false)
+                .set(BasicStudent::getOrgId, sysUser.getOrgId())
+                .set(BasicStudent::getUpdateId, sysUser.getId())
+                .in(BasicStudent::getId, idList);
         return this.update(updateWrapper);
     }
 
@@ -109,17 +109,17 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                 BeanUtils.copyProperties(e, basicStudentImportDto);
                 return basicStudentImportDto;
             }).collect(Collectors.toList());
-            map.put("dataCount",datasource.size());
+            map.put("dataCount", datasource.size());
 
 
             // 新校区名称集合
             Set<String> newCampusNameSet = datasource.stream().map(BasicStudentImportDto::getCampusName).collect(Collectors.toSet());
             // 旧校区集合
-            List<BasicCampus> basicCampusList = basicCampusService.list(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable,true).eq(BasicCampus::getSchoolId,schoolId));
+            List<BasicCampus> basicCampusList = basicCampusService.list(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable, true).eq(BasicCampus::getSchoolId, schoolId));
             Set<String> oldCampusNameSet = basicCampusList.stream().map(BasicCampus::getCampusName).collect(Collectors.toSet());
 
             // 需要新增的校区集合
-            Set<String> addCampusNameSet =  newCampusNameSet.stream().filter(e -> !oldCampusNameSet.contains(e)).collect(Collectors.toSet());
+            Set<String> addCampusNameSet = newCampusNameSet.stream().filter(e -> !oldCampusNameSet.contains(e)).collect(Collectors.toSet());
             List<BasicCampus> addBasicCampusList = new ArrayList<>();
             for (String campusName : addCampusNameSet) {
                 BasicCampus basicCampus = new BasicCampus();
@@ -148,9 +148,9 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
                 BasicStudentParams basicStudentParams = new BasicStudentParams();
                 basicStudentParams.setCampusId(basicCampusService.getOne(new QueryWrapper<BasicCampus>().lambda()
-                        .eq(BasicCampus::getSchoolId,schoolId)
-                        .eq(BasicCampus::getCampusName,campusName)
-                        .eq(BasicCampus::getEnable,true))
+                        .eq(BasicCampus::getSchoolId, schoolId)
+                        .eq(BasicCampus::getCampusName, campusName)
+                        .eq(BasicCampus::getEnable, true))
                         .getId());
                 basicStudentParams.setStudentName(studentName);
                 basicStudentParams.setStudentCode(studentCode);
@@ -158,16 +158,16 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                 basicStudentParams.setClazz(clazz);
 
                 BasicStudent tmp = this.getOne(new QueryWrapper<BasicStudent>().lambda()
-                        .eq(BasicStudent::getSchoolId,sysUser.getSchoolId())
-                        .eq(BasicStudent::getEnable,true)
-                        .eq(BasicStudent::getStudentCode,studentCode));
-                if (Objects.nonNull(tmp)){
+                        .eq(BasicStudent::getSchoolId, sysUser.getSchoolId())
+                        .eq(BasicStudent::getEnable, true)
+                        .eq(BasicStudent::getStudentCode, studentCode));
+                if (Objects.nonNull(tmp)) {
                     basicStudentParams.setId(tmp.getId());
                 }
                 addBasicStudentParamsList.add(basicStudentParams);
             }
 
-            List<BasicStudent> basicStudentList = this.editEntityHelp(addBasicStudentParamsList,sysUser);
+            List<BasicStudent> basicStudentList = this.editEntityHelp(addBasicStudentParamsList, sysUser);
             this.saveOrUpdateBatch(basicStudentList);
         }
 
@@ -176,11 +176,12 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
     /**
      * 学生保存助手方法（应对学生保存和导入批量保存）
+     *
      * @param basicStudentParamsList 学生参数
-     * @param sysUser 操作人
+     * @param sysUser                操作人
      * @return 结果
      */
-    private List<BasicStudent> editEntityHelp(List<BasicStudentParams> basicStudentParamsList,SysUser sysUser){
+    private List<BasicStudent> editEntityHelp(List<BasicStudentParams> basicStudentParamsList, SysUser sysUser) {
         Long schoolId = sysUser.getSchoolId();
         List<BasicStudent> editEntityList = new ArrayList<>();
         for (BasicStudentParams basicStudentParams : basicStudentParamsList) {
@@ -189,7 +190,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
             String studentCode = basicStudentParams.getStudentCode();
             String phoneNumber = basicStudentParams.getPhoneNumber();
             Long campusId = basicStudentParams.getCampusId();
-            if (Objects.isNull(basicCampusService.getById(campusId))){
+            if (Objects.isNull(basicCampusService.getById(campusId))) {
                 throw ExceptionResultEnum.ERROR.exception("所选校区不存在");
             }
             String clazz = basicStudentParams.getClazz();
@@ -197,11 +198,11 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
 
             // 检验学号在学校的唯一性
             BasicStudent check = this.getOne(new QueryWrapper<BasicStudent>().lambda()
-                    .eq(BasicStudent::getSchoolId,schoolId)
-                    .eq(BasicStudent::getStudentCode,studentCode)
-                    .eq(BasicStudent::getEnable,true));
-            if (Objects.nonNull(check)){
-                if (!check.getId().equals(id)){
+                    .eq(BasicStudent::getSchoolId, schoolId)
+                    .eq(BasicStudent::getStudentCode, studentCode)
+                    .eq(BasicStudent::getEnable, true));
+            if (Objects.nonNull(check)) {
+                if (!check.getId().equals(id)) {
                     throw ExceptionResultEnum.ERROR.exception("学生编号【" + studentCode + "】重复");
                 }
             }
@@ -217,16 +218,16 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
             basicStudent.setSchoolId(schoolId);
 
             // 保存
-            if (!SystemConstant.longNotNull(id)){
+            if (!SystemConstant.longNotNull(id)) {
                 // id为空 -> 新增
                 // 获取分布式id
                 id = SystemConstant.getDbUuid();
                 basicStudent.setId(id);
                 basicStudent.setCreateId(sysUser.getId());
-            }else {
+            } else {
                 // id不为空 -> 更新
                 BasicStudent old = this.getById(id);
-                if (Objects.isNull(old) || old.getEnable().equals(false)){
+                if (Objects.isNull(old) || old.getEnable().equals(false)) {
                     throw ExceptionResultEnum.ERROR.exception("学生主键不存在或被禁用");
                 }
                 basicStudent.setId(id);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateOrgServiceImpl.java

@@ -8,7 +8,6 @@ import com.qmth.distributed.print.business.mapper.BasicTemplateOrgMapper;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.teachcloud.common.entity.SysOrg;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,8 +42,7 @@ public class BasicTemplateOrgServiceImpl extends ServiceImpl<BasicTemplateOrgMap
     }
 
     @Override
-    public void saveBatch(TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+    public void saveBatch(Long schoolId, TemplateTypeEnum type, Long ruleId, Long[] orgIds, Long createId) {
         List<BasicTemplateOrg> list = new ArrayList<>();
         for (Long orgId : orgIds) {
             BasicTemplateOrg basicTemplateOrg = new BasicTemplateOrg();
@@ -52,8 +50,7 @@ public class BasicTemplateOrgServiceImpl extends ServiceImpl<BasicTemplateOrgMap
             basicTemplateOrg.setType(type);
             basicTemplateOrg.setRuleId(ruleId);
             basicTemplateOrg.setOrgId(orgId);
-            basicTemplateOrg.setCreateId(createId);
-            basicTemplateOrg.setCreateTime(System.currentTimeMillis());
+            basicTemplateOrg.insertInfo(createId);
             list.add(basicTemplateOrg);
         }
         this.saveBatch(list);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java

@@ -69,11 +69,11 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
                 m.setOrgs(sysOrgs);
 
-                if(type.equals(TemplateTypeEnum.GENERIC.name())){
+                if (type.equals(TemplateTypeEnum.GENERIC.name())) {
                     QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
                     queryWrapper.lambda().eq(ExamCard::getTemplateId, m.getId());
                     List<ExamCard> examCards = examCardService.list(queryWrapper);
-                    if(!CollectionUtils.isEmpty(examCards)){
+                    if (!CollectionUtils.isEmpty(examCards)) {
                         m.setCardId(examCards.get(0).getId().toString());
                     }
                 }
@@ -97,10 +97,8 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             if (basicTemplate != null) {
                 throw ExceptionResultEnum.ERROR.exception("模板名称已存在");
             }
-            template.setId(SystemConstant.getDbUuid());
+            template.insertInfo(sysUser.getId());
             template.setOrgId(sysUser.getOrgId());
-            template.setCreateId(sysUser.getId());
-            template.setCreateTime(System.currentTimeMillis());
             isSuccess = this.save(template);
         }
         // 修改
@@ -114,25 +112,21 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             if (used) {
                 throw ExceptionResultEnum.ERROR.exception("通用题卡模板已绑定任务，不能修改");
             }
-
-            template.setUpdateId(sysUser.getId());
-            template.setUpdateTime(System.currentTimeMillis());
-
+            template.updateInfo(sysUser.getId());
             //删除权限
             basicTemplateOrgService.removeByRuleId(template.getId());
             isSuccess = this.updateById(template);
-
         }
 
         // 新增权限
-        basicTemplateOrgService.saveBatch(template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
+        basicTemplateOrgService.saveBatch(schoolId, template.getType(), template.getId(), template.getOrgIds(), template.getCreateId());
 
         if (TemplateTypeEnum.GENERIC.name().equals(template.getType().name())) {
             // 通用题卡，同步更新exam_card
             BasicAttachment attachment = basicAttachmentService.getById(template.getAttachmentId());
 
             ExamCard examCard1 = examCardService.getOneByTemplateId(template.getId());
-            if(examCard1 == null) {
+            if (examCard1 == null) {
                 ExamCard examCard = examCardService.getOneByTemplateId(template.getId());
                 ExamCardParams examCardParams = new ExamCardParams();
                 examCardParams.setId(examCard == null ? null : examCard.getId());

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamCardServiceImpl.java

@@ -72,12 +72,11 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         // 新增
         ExamCard examCard;
         ExamCardDetail examCardDetail;
-        if(examCardParams.getTitle().getBytes().length > 80){
+        if (examCardParams.getTitle().getBytes().length > 80) {
             throw ExceptionResultEnum.ERROR.exception("标题最长只能输入80个字符");
         }
         if (examCardParams.getId() == null) {
             examCard = new ExamCard();
-            examCard.setId(SystemConstant.getDbUuid());
             examCard.setSchoolId(schoolId);
             examCard.setOrgId(user.getOrgId());
             examCard.setCourseCode(examCardParams.getCourseCode());
@@ -87,18 +86,16 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCard.setStatus(examCardParams.getStatus());
             examCard.setType(examCardParams.getType());
             examCard.setTemplateId(examCardParams.getTemplateId());
-            examCard.setCreateId(user.getId());
-            examCard.setCreateTime(System.currentTimeMillis());
+            examCard.insertInfo(user.getId());
+            examCard.setOrgId(user.getOrgId());
             this.save(examCard);
 
             examCardDetail = new ExamCardDetail();
-            examCardDetail.setId(SystemConstant.getDbUuid());
             examCardDetail.setCardId(examCard.getId());
             examCardDetail.setContent(examCardParams.getContent());
             examCardDetail.setHtmlContent(examCardParams.getHtmlContent());
             examCardDetail.setAttachmentId(examCardParams.getAttachmentId());
-            examCardDetail.setCreateId(user.getId());
-            examCardDetail.setCreateTime(System.currentTimeMillis());
+            examCardDetail.insertInfo(user.getId());
             examCardDetailService.save(examCardDetail);
         }
         // 修改
@@ -123,8 +120,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             examCardDetail.setContent(examCardParams.getContent());
             examCardDetail.setHtmlContent(examCardParams.getHtmlContent());
             examCardDetail.setAttachmentId(examCardParams.getAttachmentId());
-            examCardDetail.setUpdateId(user.getId());
-            examCardDetail.setUpdateTime(System.currentTimeMillis());
+            examCardDetail.updateInfo(user.getId());
             examCardDetailService.updateById(examCardDetail);
 
         }
@@ -247,7 +243,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             ExamCardDetail examCardDetail = examCardDetailService.getByCardId(cardId);
             BasicAttachment attachment = basicAttachmentService.getById(examCardDetail.getCustAttachmentId());
             String fileName = attachment.getName() + attachment.getType();
-            teachcloudCommonService.copyFile(sj.toString(),fileName, attachment);
+            teachcloudCommonService.copyFile(sj.toString(), fileName, attachment);
         }
         // 压缩
         teachcloudCommonService.downloadFileAndZip(response, rootPath, time);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1169,7 +1169,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
         InputStream inputStream = (InputStream) map.get("inputStream");
         List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(SysUserImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             List<ExcelError> excelErrorTemp = new ArrayList<>();
-            Map<String,String> checkMap = new HashMap<>();
+            Map<String,String> checkName = new HashMap<>();
+            Map<String,String> checkCode = new HashMap<>();
             for (int i = 0; i < finalExcelList.size(); i++) {
                 LinkedMultiValueMap<Integer, Object> excelMap = finalExcelList.get(i);
                 List<Object> sysUserImportDtoList = excelMap.get(i);
@@ -1182,10 +1183,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     String roleName = sysUserImportDto.getRoleName();
 
                     // 检验excel中
-                    if (checkMap.containsKey(name)){
-                        throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【name】：" + name);
+                    if (checkName.containsKey(name)){
+                        throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【姓名】：" + name);
                     }else {
-                        checkMap.put(name,code);
+                        checkName.put(name,code);
+                    }
+                    if (checkCode.containsKey(code)){
+                        throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【工号】：" + code);
+                    }else {
+                        checkCode.put(code,name);
                     }
 
                     excelErrorTemp.addAll(ExcelUtil.checkExcelField(sysUserImportDto, y, i));
@@ -1195,9 +1201,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     if (Objects.isNull(name) || name.length() > 30){
                         excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[课程名称]不符合输入规范"));
                     }
-//                    if (Objects.isNull(phoneNumber) || !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)){
-//                        excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
-//                    }
+                    if (Objects.isNull(phoneNumber) || !phoneNumber.matches(SystemConstant.REGULAR_EXPRESSION_OF_PHONE)){
+                        excelErrorTemp.add(new ExcelError(y + 1,"excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[电话号码]不符合输入规范"));
+                    }
                 }
             }
             if (excelErrorTemp.size() > 0) {

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCampusController.java

@@ -2,10 +2,10 @@ package com.qmth.distributed.print.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.distributed.print.business.service.BasicCampusService;
+import com.qmth.teachcloud.common.bean.params.BasicCampusParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.service.BasicCampusService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -53,7 +53,7 @@ public class BasicCampusController {
     @ApiOperation(value = "校区管理-删除（逻辑）")
     @RequestMapping(value = "/delete", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    public Result deleteBasicCampus(@ApiParam(value = "校区id",required = true) @RequestParam String id) {
+    public Result deleteBasicCampus(@ApiParam(value = "校区id", required = true) @RequestParam String id) {
         return ResultUtil.ok(basicCampusService.removeBasicCampusById(SystemConstant.convertIdToLong(id)));
     }
 

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicExamRuleController.java

@@ -2,6 +2,7 @@ package com.qmth.distributed.print.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.teachcloud.common.util.Result;
@@ -38,8 +39,7 @@ public class BasicExamRuleController {
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list() {
-        BasicExamRule examRule = basicExamRuleService.getBySchoolId();
-        return ResultUtil.ok(examRule);
+        return ResultUtil.ok(basicExamRuleService.getBySchoolId());
     }
 
     /**
@@ -51,8 +51,7 @@ public class BasicExamRuleController {
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public Result save(@RequestBody BasicExamRule examRule) {
-        String id = basicExamRuleService.saveExamRule(examRule);
-        return ResultUtil.ok(id, "");
+        return ResultUtil.ok(new EditResult(basicExamRuleService.saveExamRule(examRule)));
     }
 
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/TFFlowController.java

@@ -75,7 +75,6 @@ public class TFFlowController {
     @ApiResponses({@ApiResponse(code = 200, message = "常规信息", response = ResultUtil.class)})
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Result register(@ApiParam(value = "上传文件", required = true) @RequestParam MultipartFile file,
-                           @ApiParam(value = "上传文件类型", required = true) @RequestParam UploadFileEnum type,
                            @ApiParam(value = "流程文件名称", required = false) @RequestParam(required = false) String name,
                            @ApiParam(value = "流程是否发布,true：发布，false：不发布", required = false) @RequestParam(required = false) Boolean publish) {
         BasicAttachment basicAttachment = null;
@@ -86,7 +85,7 @@ public class TFFlowController {
             if (!format.equalsIgnoreCase(".bpmn") && !format.contains("bpmn20.xml")) {
                 throw ExceptionResultEnum.ERROR.exception("上传的流程文件格式只能为.bmpn或bpmn20.xml");
             }
-            basicAttachment = printCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), type);
+            basicAttachment = printCommonService.saveAttachment(file, ServletUtil.getRequestMd5(), UploadFileEnum.FILE);
             if (Objects.isNull(basicAttachment)) {
                 throw ExceptionResultEnum.ATTACHMENT_ERROR.exception();
             }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/OrgDto.java

@@ -29,6 +29,40 @@ public class OrgDto {
 
     private List<OrgDto> children = new ArrayList<>();
 
+    @ApiModelProperty(value = "校区id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long campusId;
+
+    @ApiModelProperty(value = "校区名称")
+    private String campusName;
+
+    @ApiModelProperty(value = "校区编码")
+    private String campusCode;
+
+    public String getCampusCode() {
+        return campusCode;
+    }
+
+    public void setCampusCode(String campusCode) {
+        this.campusCode = campusCode;
+    }
+
+    public String getCampusName() {
+        return campusName;
+    }
+
+    public void setCampusName(String campusName) {
+        this.campusName = campusName;
+    }
+
+    public Long getCampusId() {
+        return campusId;
+    }
+
+    public void setCampusId(Long campusId) {
+        this.campusId = campusId;
+    }
+
     public Long getId() {
         return id;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BasicCampusParams.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicCampusParams.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.params;
+package com.qmth.teachcloud.common.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/BasicCampusResult.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicCampusResult.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.result;
+package com.qmth.teachcloud.common.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -77,7 +77,7 @@ public class SystemConstant {
     //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
     //英文字母、数字、中文括号、英文括号、下划线(_)、减号(-)、中文横线(—)
     public static final String REGULAR_EXPRESSION_OF_CODE = "[a-zA-Z0-9](\\w+)?-?(\\w+)?—?(\\w+)?(\\((\\w+)?-?(\\w+)?—?(\\w+)?\\))?(\\（(\\w+)?-?(\\w+)?—?(\\w+)?\\）)?(\\w+)?";
-    public static final String REGULAR_EXPRESSION_OF_PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\\\d{8}$";
+    public static final String REGULAR_EXPRESSION_OF_PHONE = "((\\d{3,4})|(\\(\\d{3,4}\\)-))?\\d{7,8}";
     public static final String SYS_USER = "sysUser";
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicCampus.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicCampus.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/SysOrg.java

@@ -54,6 +54,19 @@ public class SysOrg extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否启用，0：停用，1：启用")
     private Boolean enable;
 
+    @ApiModelProperty(value = "校区id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(exist = false)
+    private Long campusId;
+
+    public Long getCampusId() {
+        return campusId;
+    }
+
+    public void setCampusId(Long campusId) {
+        this.campusId = campusId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicCampusMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicCampusMapper.java

@@ -1,8 +1,8 @@
-package com.qmth.distributed.print.business.mapper;
+package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.result.BasicCampusResult;
-import com.qmth.distributed.print.business.entity.BasicCampus;
+import com.qmth.teachcloud.common.bean.result.BasicCampusResult;
+import com.qmth.teachcloud.common.entity.BasicCampus;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,6 +19,7 @@ public interface BasicCampusMapper extends BaseMapper<BasicCampus> {
 
     /**
      * 查找基础校区信息
+     *
      * @param schoolId 学校id
      * @return 基础校区信息
      */

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/SysOrgMapper.java

@@ -1,6 +1,7 @@
 package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.teachcloud.common.bean.dto.OrgDto;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.OrgTypeEnum;
@@ -43,4 +44,12 @@ public interface SysOrgMapper extends BaseMapper<SysOrg> {
      * @return
      */
     List<SysOrg> findByConnectByRootOrgId(@Param("orgId") Long orgId);
+
+    /**
+     * 获取所有机构
+     *
+     * @param schoolId
+     * @return
+     */
+    List<OrgDto> listOrgAll(@Param("schoolId") Long schoolId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicCampusService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/BasicCampusService.java

@@ -1,9 +1,9 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
-import com.qmth.distributed.print.business.bean.result.BasicCampusResult;
-import com.qmth.distributed.print.business.entity.BasicCampus;
+import com.qmth.teachcloud.common.bean.params.BasicCampusParams;
+import com.qmth.teachcloud.common.bean.result.BasicCampusResult;
+import com.qmth.teachcloud.common.entity.BasicCampus;
 
 import java.util.List;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysOrgService.java

@@ -21,6 +21,14 @@ public interface SysOrgService extends IService<SysOrg> {
 
     List<OrgDto> listOrgTree();
 
+    /**
+     * 获取所有机构
+     *
+     * @param schoolId
+     * @return
+     */
+    List<OrgDto> listOrgAll(Long schoolId);
+
     boolean saveOrg(SysOrg org);
 
     /**
@@ -79,6 +87,7 @@ public interface SysOrgService extends IService<SysOrg> {
 
     /**
      * 根据机构类型和机构id查询它和它下级所有符合条件的机构
+     *
      * @param orgTypeEnum 机构类型
      * @return 机构集合
      */

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCampusServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCampusServiceImpl.java

@@ -1,16 +1,16 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.params.BasicCampusParams;
-import com.qmth.distributed.print.business.bean.result.BasicCampusResult;
-import com.qmth.distributed.print.business.entity.BasicCampus;
-import com.qmth.distributed.print.business.mapper.BasicCampusMapper;
-import com.qmth.distributed.print.business.service.BasicCampusService;
+import com.qmth.teachcloud.common.bean.params.BasicCampusParams;
+import com.qmth.teachcloud.common.bean.result.BasicCampusResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicCampus;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.mapper.BasicCampusMapper;
+import com.qmth.teachcloud.common.service.BasicCampusService;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysOrgServiceImpl.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.common.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.teachcloud.common.bean.dto.OrgDto;
 import com.qmth.teachcloud.common.bean.params.UserSaveParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicCampus;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysRole;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -15,10 +17,7 @@ import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.mapper.SysOrgMapper;
 import com.qmth.teachcloud.common.mapper.SysUserMapper;
-import com.qmth.teachcloud.common.service.SysOrgService;
-import com.qmth.teachcloud.common.service.SysRoleService;
-import com.qmth.teachcloud.common.service.SysUserService;
-import com.qmth.teachcloud.common.service.TeachcloudCommonService;
+import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.dao.DuplicateKeyException;
@@ -27,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -52,24 +52,14 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Resource
     TeachcloudCommonService teachcloudCommonService;
 
+    @Resource
+    BasicCampusService basicCampusService;
+
     @Override
     public List<OrgDto> listOrgTree() {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).orderByAsc(SysOrg::getParentId);
-        List<SysOrg> orgList = this.list(queryWrapper);
-        Map<Long, OrgDto> map = new LinkedHashMap<>();
-        for (SysOrg sysOrg : orgList) {
-            OrgDto orgDto = new OrgDto();
-            orgDto.setId(sysOrg.getId());
-            orgDto.setSchoolId(String.valueOf(sysOrg.getSchoolId()));
-            orgDto.setCode(sysOrg.getCode());
-            orgDto.setName(sysOrg.getName());
-            orgDto.setParentId(sysOrg.getParentId());
-            orgDto.setEnable(sysOrg.getEnable());
-            orgDto.setType(sysOrg.getType());
-            map.put(sysOrg.getId(), orgDto);
-        }
+        List<OrgDto> orgList = this.listOrgAll(schoolId);
+        Map<Long, OrgDto> map = orgList.stream().collect(Collectors.toMap(OrgDto::getId, Function.identity(), (dto1, dto2) -> dto1));
 
         Iterator<Long> iterator = map.keySet().iterator();
         Set<Long> deleteKeys = new HashSet<>();
@@ -88,8 +78,21 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         return new ArrayList<>(map.values());
     }
 
+    /**
+     * 获取所有机构
+     *
+     * @param schoolId
+     * @return
+     */
+    @Override
+    public List<OrgDto> listOrgAll(Long schoolId) {
+        return sysOrgMapper.listOrgAll(schoolId);
+    }
+
     @Override
+    @Transactional
     public boolean saveOrg(SysOrg org) {
+        boolean success = false;
         try {
             Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
             org.setSchoolId(schoolId);
@@ -105,13 +108,25 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 }
                 checkOrgTree(org);
                 org.insertInfo(sysUser.getId());
-                return this.save(org);
+                success = this.save(org);
             } else { // 修改
                 if (sysOrg != null && org.getId().longValue() != sysOrg.getId().longValue()) {
                     throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
                 }
                 org.updateInfo(sysUser.getId());
-                return this.updateById(org);
+                success = this.updateById(org);
+            }
+            if (Objects.nonNull(org.getCampusId())) {//更新校区
+                BasicCampus basicCampus = basicCampusService.getById(org.getCampusId());
+                if (Objects.nonNull(basicCampus) && Objects.nonNull(basicCampus.getPrintHouseId())
+                        && basicCampus.getPrintHouseId().longValue() != org.getId().longValue()) {
+                    throw ExceptionResultEnum.ERROR.exception("该校区已绑定其它印刷室");
+                }
+
+                UpdateWrapper<BasicCampus> basicCampusUpdateWrapper = new UpdateWrapper<>();
+                basicCampusUpdateWrapper.lambda().eq(BasicCampus::getId, org.getCampusId())
+                        .set(BasicCampus::getPrintHouseId, org.getId());
+                basicCampusService.update(basicCampusUpdateWrapper);
             }
         } catch (Exception e) {
             if (e instanceof DuplicateKeyException) {
@@ -124,7 +139,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 ResultUtil.error(e.getMessage());
             }
         }
-        return true;
+        return success;
     }
 
     /**
@@ -287,9 +302,9 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     public List<SysOrg> findDeepByOrgIdAndType(OrgTypeEnum orgTypeEnum) {
         Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         List<SysOrg> sysOrgList = new ArrayList<>();
-        if (orgIds.size() > 0){
-            sysOrgList = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getType,orgTypeEnum).eq(SysOrg::getEnable,true)
-                    .in(SysOrg::getId,orgIds));
+        if (orgIds.size() > 0) {
+            sysOrgList = this.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getType, orgTypeEnum).eq(SysOrg::getEnable, true)
+                    .in(SysOrg::getId, orgIds));
         }
         return sysOrgList;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserServiceImpl.java

@@ -474,7 +474,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }).collect(Collectors.toList());
             // TODO: 2021/7/16 校验datasource集合的正确性
             map.put("dataCount", datasource.size());
-            System.out.println("datasource：\n" + datasource);
+//            System.out.println("datasource：\n" + datasource);
 
             for (int y = 0; y < Objects.requireNonNull(sysUserImportDtoList).size(); y++) {
                 SysUserImportDto sysUserImportDto = (SysUserImportDto) sysUserImportDtoList.get(y);
@@ -524,6 +524,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         List<SysUser> userList = new ArrayList<>();
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
         for (UserSaveParams userSaveParams : userSaveParamsList) {
+            String code = userSaveParams.getCode();
+            SysUser check = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId,schoolId).eq(SysUser::getEnable,true).eq(SysUser::getCode,code));
+            if (Objects.nonNull(check)){
+                if (!check.getId().equals(userSaveParams.getId())){
+                    throw ExceptionResultEnum.ERROR.exception("用户工号【" + code +"】重复");
+                }
+            }
             Gson gson = new Gson();
             userSaveParams.setSchoolId(schoolId);
             SysUser userCell = gson.fromJson(gson.toJson(userSaveParams), SysUser.class);

distributed-print-business/src/main/resources/mapper/BasicCampusMapper.xml → teachcloud-common/src/main/resources/mapper/BasicCampusMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.BasicCampusMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicCampusMapper">
 
     <select id="findBasicCampusResult"
-            resultType="com.qmth.distributed.print.business.bean.result.BasicCampusResult">
+            resultType="com.qmth.teachcloud.common.bean.result.BasicCampusResult">
         SELECT
             cam.id AS id,
             campus_name AS campusName,

teachcloud-common/src/main/resources/mapper/SysOrgMapper.xml

@@ -30,4 +30,28 @@
         SELECT so.* FROM sys_org so WHERE FIND_IN_SET(id, getRootChildId(#{orgId}))
     </select>
 
+    <select id="listOrgAll" resultType="com.qmth.teachcloud.common.bean.dto.OrgDto">
+        select
+            so.id,
+            so.school_id as school_id,
+            so.code,
+            so.name,
+            so.`type`,
+            so.parent_id as parentId,
+            so.enable,
+            bc.id as campusId,
+            bc.campus_name as campusName,
+            bc.campus_code as campusCode
+        from
+            sys_org so
+        left join basic_campus bc on
+            bc.print_house_id = so.id
+            and so.`type` = 'PRINTING_HOUSE'
+        <where>
+            <if test="schoolId != null and schoolId != ''">
+                and so.school_id = #{schoolId}
+            </if>
+        </where>
+            order by so.parent_id asc
+    </select>
 </mapper>