3.3.1 优化

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

@@ -97,6 +97,19 @@ public class BasicCardRule extends BaseEntity implements Serializable {
      */
     @TableField("title_rule")
     private String titleRule;
+
+    /**
+     * 一级题卡副标题
+     */
+    @TableField("first_level_subheading")
+    private String firstLevelSubheading;
+
+    /**
+     * 二级题卡副标题
+     */
+    @TableField("second_level_subheading")
+    private String secondLevelSubheading;
+
     /**
      * 注意事项
      */
@@ -252,6 +265,22 @@ public class BasicCardRule extends BaseEntity implements Serializable {
         this.titleRule = titleRule;
     }
 
+    public String getFirstLevelSubheading() {
+        return firstLevelSubheading;
+    }
+
+    public void setFirstLevelSubheading(String firstLevelSubheading) {
+        this.firstLevelSubheading = firstLevelSubheading;
+    }
+
+    public String getSecondLevelSubheading() {
+        return secondLevelSubheading;
+    }
+
+    public void setSecondLevelSubheading(String secondLevelSubheading) {
+        this.secondLevelSubheading = secondLevelSubheading;
+    }
+
     public String getAttention() {
         return attention;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TFFlowApproveMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.bean.result.FlowApproveListResult;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -38,6 +39,7 @@ public interface TFFlowApproveMapper extends BaseMapper<TFFlowApprove> {
      * @param pendApproveUserName
      * @param schoolId
      * @param orgId
+     * @param dpr
      * @return
      */
     public IPage<FlowApproveListResult> findApproveList(@Param("iPage") IPage<Map> iPage,
@@ -52,5 +54,6 @@ public interface TFFlowApproveMapper extends BaseMapper<TFFlowApprove> {
                                                         @Param("endTime") Long endTime,
                                                         @Param("pendApproveUserName") String pendApproveUserName,
                                                         @Param("schoolId") Long schoolId,
-                                                        @Param("orgId") Long orgId);
+                                                        @Param("orgId") Long orgId,
+                                                        @Param("dpr") DataPermissionRule dpr);
 }

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

@@ -6,7 +6,11 @@ import com.qmth.distributed.print.business.bean.result.FlowApproveListResult;
 import com.qmth.distributed.print.business.entity.TFFlowApprove;
 import com.qmth.distributed.print.business.mapper.TFFlowApproveMapper;
 import com.qmth.distributed.print.business.service.TFFlowApproveService;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
+import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.FlowStatusEnum;
+import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -24,6 +28,9 @@ import java.util.Objects;
 @Service
 public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, TFFlowApprove> implements TFFlowApproveService {
 
+    @Resource
+    private BasicRoleDataPermissionService basicRoleDataPermissionService;
+
     @Resource
     TFFlowApproveMapper tfFlowApproveMapper;
 
@@ -54,6 +61,8 @@ public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, T
      */
     @Override
     public IPage<FlowApproveListResult> findApproveList(IPage<Map> iPage,Long semesterId, Long examId, String courseCode, String paperNumber, FlowStatusEnum status, String teacherUserName, Long teachingRoomId, Long startTime, Long endTime, String pendApproveUserName, Long schoolId, Long orgId) {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
         return tfFlowApproveMapper.findApproveList(iPage,
                 semesterId,
                 examId,
@@ -66,6 +75,7 @@ public class TFFlowApproveServiceImpl extends ServiceImpl<TFFlowApproveMapper, T
                 endTime,
                 pendApproveUserName,
                 schoolId,
-                orgId);
+                orgId,
+                dpr);
     }
 }

distributed-print-business/src/main/resources/mapper/BasicCardRuleMapper.xml

@@ -32,7 +32,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        select id, school_id, name, exam_number_style,exam_number_digit, paper_type, exam_absent, write_sign, discipline,undertaking_enable, undertaking_body,required_fields, extend_fields, title_rule, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
+        select id, school_id, name, exam_number_style,exam_number_digit, paper_type, exam_absent, write_sign, discipline,undertaking_enable, undertaking_body,required_fields, extend_fields, title_rule,first_level_subheading,second_level_subheading, attention, objective_attention, subjective_attention, enable, remark, create_id, create_time, update_id, update_time, fill_number from basic_card_rule
     </sql>
     <select id="listPage" resultType="com.qmth.distributed.print.business.entity.BasicCardRule">
         <include refid="Base_Column_List"></include>

distributed-print-business/src/main/resources/mapper/TFFlowApproveMapper.xml

@@ -64,6 +64,8 @@
         et.exam_id = be.id
         left join basic_semester bs on
         be.semester_id = bs.id
+        left join sys_user su on
+            et.user_id = su.id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and tffa.school_id = #{schoolId}
@@ -107,6 +109,17 @@
             <if test="endTime != null and endTime != ''">
                 and tffa.create_time <![CDATA[ < ]]> #{endTime}
             </if>
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND et.user_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND su.org_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
             and tffa.enable = 1
             and et.enable = 1
         </where>

distributed-print/install/mysql/upgrade/3.3.1.sql

@@ -15,3 +15,8 @@ UPDATE `sys_privilege` SET `related` = '50,49,193,194,621' WHERE (`id` = '310');
 --------------3.3.1新需求--------------
 ALTER TABLE `mark_paper`
     ADD COLUMN `open_double_marking` BIGINT(1) NULL DEFAULT 0 COMMENT '是否开启双评：true-开启，false-关闭' AFTER `paper_type`;
+
+ALTER TABLE `basic_card_rule`
+    ADD COLUMN `first_level_subheading` VARCHAR(200) NULL COMMENT '一级副标题' AFTER `fill_number`,
+ADD COLUMN `second_level_subheading` VARCHAR(200) NULL COMMENT '二级副标题' AFTER `first_level_subheading`;
+

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

@@ -23,7 +23,7 @@ import java.util.Set;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
-    IPage<UserDto> listForPrintSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgId") Long orgId, @Param("roleId") String roleId, @Param("enable") Boolean enable);
+    IPage<UserDto> listForPrintSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("userInfo") String userInfo, @Param("orgId") Long orgId, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("dpr") DataPermissionRule dpr);
 
     IPage<UserDto> listForReportSystem(Page<UserDto> page, @Param("schoolId") Long schoolId, @Param("roleId") String roleId, @Param("enable") Boolean enable, @Param("loginName") String loginName, @Param("realName") String realName);
 

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

@@ -93,12 +93,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     SysRoleGroupMemberService sysRoleGroupMemberService;
 
+    @Resource
+    BasicRoleDataPermissionService basicRoleDataPermissionService;
+
     @Override
     public IPage<UserDto> listForPrintSystem(String userInfo, Long orgId, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(schoolId, requestUser.getId(), ServletUtil.getRequest().getServletPath());
         Page<UserDto> page = new Page<>(pageNumber, pageSize);
-        IPage<UserDto> userDtoIPage = this.baseMapper.listForPrintSystem(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable);
+        IPage<UserDto> userDtoIPage = this.baseMapper.listForPrintSystem(page, schoolId, SystemConstant.translateSpecificSign(userInfo), orgId, roleId, enable, dpr);
         if (userDtoIPage.getRecords().size() > 0) {
             userDtoIPage.getRecords().forEach(m -> {
                 //角色

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

@@ -72,6 +72,17 @@
             <if test="enable != null and enable != '' or enable == 0">
                 and a.enable = #{enable}
             </if>
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND a.create_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND a.org_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
         </where>
         order by a.enable desc, a.create_time desc
     </select>