bug-校区绑定印刷室

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/BasicCampusParams.java

@@ -28,6 +28,10 @@ public class BasicCampusParams {
     @Length(min = 1,message = "请输入校区编码")
     private String campusCode;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "印刷室id")
+    private Long printHouseId;
+
     public Long getId() {
         return id;
     }
@@ -51,4 +55,12 @@ public class BasicCampusParams {
     public void setCampusCode(String campusCode) {
         this.campusCode = campusCode;
     }
+
+    public Long getPrintHouseId() {
+        return printHouseId;
+    }
+
+    public void setPrintHouseId(Long printHouseId) {
+        this.printHouseId = printHouseId;
+    }
 }

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

@@ -47,6 +47,7 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
         Long campusId = basicCampusParams.getId();
         String campusName = basicCampusParams.getCampusName();
         String campusCode = basicCampusParams.getCampusCode();
+        Long printHouseId = basicCampusParams.getPrintHouseId();
         if (!SystemConstant.strNotNull(campusCode)){
             throw ExceptionResultEnum.ERROR.exception("缺少校区编号");
         }
@@ -70,6 +71,7 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
             updateWrapper.lambda()
                     .set(BasicCampus::getCampusName,campusName)
                     .set(BasicCampus::getSchoolId,schoolId)
+                    .set(BasicCampus::getPrintHouseId, printHouseId)
                     .set(BasicCampus::getUpdateId,sysUser.getId())
                     .eq(BasicCampus::getId,campusId);
             this.update(updateWrapper);
@@ -80,6 +82,7 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
             basicCampus.setId(campusId);
             basicCampus.setCampusCode(campusCode);
             basicCampus.setCampusName(campusName);
+            basicCampus.setPrintHouseId(printHouseId);
             basicCampus.setOrgId(orgId);
             basicCampus.setEnable(true);
             basicCampus.setCreateId(sysUser.getId());

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

@@ -16,8 +16,6 @@
             basic_campus cam
                 LEFT JOIN
             sys_org org ON cam.print_house_id = org.id
-                AND org.type = 'PRINTING_HOUSE'
-                AND org.enable = TRUE
         WHERE
             cam.school_id = #{schoolId}
           AND cam.enable = TRUE