版本号：X1.1.0（存在数据库修改）

表cw_project_report_archive新增字段 audit_money（审计收费金额（元））
删除财务质量复核时的审计收费字段，在归档时添加审计收费字段，并在列表页面进行汇总操作展示

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/domain/CwProjectReportData.java

@@ -98,6 +98,16 @@ public class CwProjectReportData extends BaseDTO {
      */
     private String signatureAnnotator2;
     /**
+     * 签字注师1
+     */
+    @Excel(name = "签字注师1",width = 12,orderNum = "7")
+    private String signatureAnnotator1Name;
+    /**
+     * 签字注师2
+     */
+    @Excel(name = "签字注师2",width = 12,orderNum = "8")
+    private String signatureAnnotator2Name;
+    /**
      * 盖章类型
      */
     private String signatureType;
@@ -113,13 +123,13 @@ public class CwProjectReportData extends BaseDTO {
      * 创建人
      */
     @TableField(exist = false)
-    @Excel(name = "创建人",width = 12,orderNum = "7")
+    @Excel(name = "创建人",width = 12,orderNum = "9")
     private String userName; //用户名
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "8")
+    @Excel(name = "创建时间", exportFormat="yyyy-MM-dd",width = 16,orderNum = "10")
     private Date createDate;
 
     /**
@@ -138,6 +148,10 @@ public class CwProjectReportData extends BaseDTO {
     @TableField(exist = false)
     private String[] contractDates;
 
+
+    @TableField(exist = false)
+    private String[] auditPassDates;
+
     /**
      * 签章documentId
      */
@@ -166,7 +180,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 公章流程status
      */
-    @Excel(name = "签章状态",width = 12,orderNum = "10")
+    @Excel(name = "签章状态",width = 12,orderNum = "12")
     private String status1;
 
     /**
@@ -287,7 +301,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告文号
      */
-    @Excel(name = "报告文号",width = 12,orderNum = "4")
+    @Excel(name = "报告文号",width = 30,orderNum = "4")
     private String reportNo;
 
     private String[] contractAmounts;
@@ -300,7 +314,7 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告复核流程状态
      */
-    @Excel(name = "复核状态",width = 12,orderNum = "9")
+    @Excel(name = "复核状态",width = 12,orderNum = "11")
     private String reviewStatus;
 
     /**
@@ -479,4 +493,9 @@ public class CwProjectReportData extends BaseDTO {
      * 报备类型
      */
     private String filingType;
+
+    /**
+     * 是否生成报告号(用于判定是否已生成报告号使用)
+     */
+    private String existReportNumber;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/mapper/xml/CwProjectReportMapper.xml

@@ -54,6 +54,8 @@
         a.signature_type,
         a.signature_annotator1,
         a.signature_annotator2,
+        g.name as "signatureAnnotator1Name",
+        h.name as "signatureAnnotator2Name",
         a.signature_contract_id,
         a.real_create,
         a.proc_ins_id,
@@ -95,6 +97,8 @@
         LEFT JOIN sys_user d on a.create_by = d.id
         LEFT JOIN sys_user e on b.project_master_id = e.id
         LEFT JOIN sys_user f on b.real_header = f.id
+        LEFT JOIN sys_user g on a.signature_annotator1 = g.id
+        LEFT JOIN sys_user h on a.signature_annotator2 = h.id
 
         LEFT JOIN cw_project_report_signature cw_prs1 on cw_prs1.report_id = a.id and cw_prs1.type = '1' and cw_prs1.del_flag = '0'
         LEFT JOIN cw_project_report_signature cw_prs2 on cw_prs2.report_id = a.id and cw_prs2.type = '2' and cw_prs2.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReport/service/CwProjectReportService.java

@@ -492,6 +492,21 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 return new Page<>();
             }
         }
+        //根据条件判定
+        if (StringUtils.isNotBlank(projectReportData.getExistReportNumber())) {
+            if("1".equals(projectReportData.getExistReportNumber())){
+                //如果选择了已生成报告号的报告信息
+                queryWrapper.isNotNull("new_line.report_no");
+            }else if("0".equals(projectReportData.getExistReportNumber())){
+                //如果选择了未生成报告号的报告信息
+                queryWrapper.isNull("new_line.report_no");
+            }
+        }
+        //4、审核通过时间（区间）
+        /*String[] auditPassDates = projectReportData.getAuditPassDates();
+        if (auditPassDates != null) {
+            queryWrapper.between("a.create_date", auditPassDates[0], auditPassDates[1]);
+        }*/
         String isBmzr = "0";
         StringBuilder officeIds = new StringBuilder();
         UserDTO userDTO = UserUtils.getCurrentUserDTO();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/controller/CwProjectReportArchiveController.java

@@ -105,6 +105,18 @@ public class CwProjectReportArchiveController {
     }
 
     /**
+     * 获取当前登录人展示数据的所有的审计收费金额总额
+     * @param cwProjectReportArchiveDTO
+     * @return
+     */
+    @ApiLog(value = "获取当前登录人展示数据的所有的审计收费金额总额", type = LogTypeEnum.SAVE)
+    @GetMapping("getAllAuditMoney")
+    public ResponseEntity getAllAuditMoney(CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception {
+        String getAllAuditMoney = cwProjectReportArchiveService.getAllAuditMoney(cwProjectReportArchiveDTO);
+        return ResponseEntity.ok (getAllAuditMoney);
+    }
+
+    /**
      * 保存财务项目报告归档信息-流程
      * @param cwProjectReportArchiveDTO
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/domain/CwProjectReportArchive.java

@@ -101,5 +101,10 @@ public class CwProjectReportArchive extends BaseEntity {
      */
     private String reportRemarks;
 
+    /**
+     * 审计收费金额
+     */
+    private Double auditMoney;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/CwProjectReportArchiveMapper.java

@@ -28,6 +28,9 @@ public interface CwProjectReportArchiveMapper extends BaseMapper<CwProjectReport
      * @return
      */
     CwProjectReportArchiveDTO queryByReportId(@Param("reportId") String reportId);
+
+
+    String getAllAuditMoney(@Param("currentUser") UserDTO currentUser, @Param("isBmzr") String isBmzr, @Param("officeIds") String officeIds, @Param(Constants.WRAPPER) QueryWrapper<CwProjectReportArchive> queryWrapper,@Param("sta") String sta);
 }
 
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -25,6 +25,7 @@
             <result property="processDefinitionId" column="process_definition_id" jdbcType="VARCHAR"/>
             <result property="status" column="status" jdbcType="VARCHAR"/>
             <result property="auditedUnitsName" column="audited_units_name" jdbcType="VARCHAR"/>
+            <result property="auditMoney" column="audit_money"/>
             <result property="createBy.name" column="user_name" jdbcType="VARCHAR"/>
             <result property="fileNumber" column="file_number" jdbcType="VARCHAR"/>
             <result property="projectMasterName" column="project_master_name" jdbcType="VARCHAR"/>
@@ -99,6 +100,7 @@
         cw_pa.project_id,
         cw_pa.name,
         cw_pa.audited_units,
+        cw_pa.audit_money,
         cw_pa.report_num,
         cw_pa.papers_num,
         cw_pa.year,
@@ -269,6 +271,53 @@
         ORDER BY cw_pa.create_date DESC
     </select>
 
+    <select id="getAllAuditMoney" resultType="java.lang.String">
+        select
+        ifnull(sum(z.audit_money),0)
+        from (select
+        DISTINCT
+        <include refid="Base_Column_List"></include>,
+        cw_wcb.name as audited_units_name,
+        su.name as user_name,
+        su1.name as project_master_name,
+        cw_pr.project_name as project_name,
+        cw_prnl.report_no,
+        date_format(cw_prnl.report_date,'%Y-%m-%d') as report_date,
+        art.ID_ as task_id,
+        (case when cw_pa.audit_date is null then timestampdiff(day,cw_prnl.report_date,now()) when cw_pa.audit_date is not null then timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) end) as archiveDay
+        from cw_project_report_archive cw_pa
+        left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
+        left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
+        left join sys_office so on so.id = su.office_id and so.del_flag ='0'
+        left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
+        left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
+        left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'
+
+        left join cw_project_members cpm on cw_pr.id = cpm.project_id
+        left join sys_user sub on cpm.user_id = sub.id
+        left join sys_user_manage_office sumo on sumo.office_id = sub.office_id
+
+        left join act_ru_task art ON cw_pa.proc_ins_id = art.PROC_INST_ID_
+
+        ${ew.customSqlSegment}
+        and cw_prnl.report_number is not null and cw_prnl.report_date is not null
+        <if test="sta == '超期未归档'">
+            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now())>60
+        </if>
+        <if test="sta == '暂时未归档'">
+            and cw_pa.audit_date is null and timestampdiff(day,cw_prnl.report_date,now()) &lt;= 60
+        </if>
+        <if test="sta == '已超期归档'">
+            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date)>60
+        </if>
+        <if test="sta == '已按时归档'">
+            and cw_pa.audit_date is not null and timestampdiff(day,cw_prnl.report_date,cw_pa.audit_date) &lt;= 60
+        </if>
+
+        ORDER BY cw_pa.create_date DESC) z
+
+    </select>
+
     <sql id="prnl_column">
         cw_pr.id as report_id,
         cw_prnl.report_no,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -334,6 +334,87 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
     }
 
     /**
+     * 保存项目归档信息
+     * @param cwProjectReportArchiveDTO
+     * @return
+     * @throws Exception
+     */
+    public String getAllAuditMoney(CwProjectReportArchiveDTO cwProjectReportArchiveDTO) throws Exception{
+        QueryWrapper<CwProjectReportArchive> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( CwProjectReportArchiveWrapper.INSTANCE.toEntity(cwProjectReportArchiveDTO), CwProjectReportArchive.class );
+        queryWrapper.eq("cw_pa.del_flag","0");
+//        queryWrapper.orderByDesc("cw_pa.create_date");
+        if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO)) {
+            if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCwProjectRecordsDTO())){
+                // 项目名称
+                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectName())){
+                    List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().like(CwProjectRecords::getProjectName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectName()));
+                    List<String> ids = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                    if(CollectionUtil.isNotEmpty(ids)) {
+                        queryWrapper.in("cw_pa.project_id",ids);
+                    }
+                }
+                // 项目经理1
+                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName())){
+                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getProjectMasterName()));
+                    List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(userIdList)){
+                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getProjectMasterId, userIdList));
+                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(projectIds)){
+                            queryWrapper.in("cw_pa.project_id",projectIds);
+                        }
+                    }
+                }
+                // 项目经理2
+                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName())){
+                    List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCwProjectRecordsDTO().getRealHeaderName()));
+                    List<String> userIdList = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                    if (CollectionUtil.isNotEmpty(userIdList)){
+                        List<CwProjectRecords> cwProjectRecords = cwProjectRecordsMapper.selectList(new QueryWrapper<CwProjectRecords>().lambda().in(CwProjectRecords::getRealHeader, userIdList));
+                        List<String> projectIds = cwProjectRecords.stream().map(CwProjectRecords::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(projectIds)){
+                            queryWrapper.in("cw_pa.project_id",projectIds);
+                        }
+                    }
+                }
+                // 创建时间
+                if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateDates())){
+                    queryWrapper.between("cw_pa.create_date", cwProjectReportArchiveDTO.getCreateDates()[0], cwProjectReportArchiveDTO.getCreateDates()[1]);
+                }
+                // 归档时间
+                if (ArrayUtil.isNotEmpty(cwProjectReportArchiveDTO.getAuditDates())){
+                    queryWrapper.between("cw_pa.audit_date", cwProjectReportArchiveDTO.getAuditDates()[0], cwProjectReportArchiveDTO.getAuditDates()[1]);
+                }
+                // 创建人
+                if (ObjectUtil.isNotEmpty(cwProjectReportArchiveDTO.getCreateBy())){
+                    if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getCreateBy().getName())){
+                        List<User> userList = userMapper.selectList(new QueryWrapper<User>().lambda().like(User::getName, cwProjectReportArchiveDTO.getCreateBy().getName()));
+                        List<String> ids = userList.stream().map(User::getId).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
+                        if (CollectionUtil.isNotEmpty(ids)){
+                            queryWrapper.in("cw_pa.create_by",ids);
+                        }
+                    }
+                }
+                // 报告文号
+                if (StringUtils.isNotBlank(cwProjectReportArchiveDTO.getReportNo())) {
+                    queryWrapper.like("cw_prnl.report_no",cwProjectReportArchiveDTO.getReportNo());
+                }
+
+            }
+        }
+        String isBmzr = "0";
+        StringBuilder officeIds = new StringBuilder();
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        List<String> manageOfficeIdList= Lists.newArrayList();
+
+        if (StringUtils.isBlank(cwProjectReportArchiveDTO.getArchiveSta())) {
+            cwProjectReportArchiveDTO.setArchiveSta("");
+        }
+        String allAuditMoney = cwProjectReportArchiveMapper.getAllAuditMoney(userDTO, isBmzr, officeIds.toString(), queryWrapper, cwProjectReportArchiveDTO.getArchiveSta());
+        return allAuditMoney;
+    }
+
+    /**
      * 根据id删除项目归档信息
      * @param ids
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/service/dto/CwProjectReportArchiveDTO.java

@@ -58,7 +58,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 案卷号
      */
-    @Excel(name = "案卷号",width = 25,orderNum = "8")
+    @Excel(name = "案卷号",width = 25,orderNum = "9")
     private String number;
 
     /**
@@ -69,7 +69,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 归档时间
      */
-    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "10")
+    @Excel(name = "归档时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "11")
     private Date auditDate;
 
     /**
@@ -85,7 +85,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 状态
      */
-    @Excel(name = "状态",width = 25,orderNum = "16")
+    @Excel(name = "状态",width = 25,orderNum = "17")
     private String status;
 
     /**
@@ -110,6 +110,12 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     private String auditedUnitsName;
 
     /**
+     * 审计收费金额
+     */
+    @Excel(name = "审计收费金额(元)",width = 25,orderNum = "8")
+    private Double auditMoney;
+
+    /**
      * 归档时间区间
      */
     private String[] auditDates;
@@ -146,13 +152,13 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 创建人姓名
      */
-    @Excel(name = "创建人",width = 25,orderNum = "14")
+    @Excel(name = "创建人",width = 25,orderNum = "15")
     private String createName;
 
     /**
      * 创建时间
      */
-    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "15")
+    @Excel(name = "创建时间",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "16")
     private String createDateT;
 
     /**
@@ -168,7 +174,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 报告日期
      */
-    @Excel(name = "报告日期",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "9")
+    @Excel(name = "报告日期",exportFormat = "yyyy-MM-dd HH:mm:ss",width = 25,orderNum = "10")
     private Date reportDate;
 
     /**
@@ -189,7 +195,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 归档状态
      */
-    @Excel(name = "归档状态",width = 25,orderNum = "11")
+    @Excel(name = "归档状态",width = 25,orderNum = "12")
     private String archiveSta;
 
     /**
@@ -205,7 +211,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 罚款金额
      */
-    @Excel(name = "罚款金额",width = 25,orderNum = "13")
+    @Excel(name = "罚款金额",width = 25,orderNum = "14")
     private String fineMoney;
 
     /**
@@ -216,7 +222,7 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     /**
      * 逾期天数（天数）
      */
-    @Excel(name = "超期天数",width = 25,orderNum = "12")
+    @Excel(name = "超期天数",width = 25,orderNum = "13")
     private String overdueDay;
 
     /**
@@ -538,4 +544,12 @@ public class CwProjectReportArchiveDTO extends BaseDTO {
     public List<String> getAuditUserIds() {
         return auditUserIds;
     }
+
+    public Double getAuditMoney() {
+        return auditMoney;
+    }
+
+    public void setAuditMoney(Double auditMoney) {
+        this.auditMoney = auditMoney;
+    }
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/mapper/xml/ProjectListMapper.xml

@@ -766,6 +766,6 @@
 
     <select id="getOverArchiveFlag" resultType="java.lang.Integer">
         select count(id) from program_archive
-        where over_archive_status =1 and status != 7
+        where over_archive_status =1 and status != 7 and create_by = #{currentUser.id}
     </select>
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -549,31 +549,31 @@ public class UserController {
     }
 
 
-//    @DemoMode
-//    @ApiLog("修改密码")
-//    @RequestMapping("savePwd")
-//    @ApiOperation(value = "修改密码")
-//    public ResponseEntity savePwd(String oldPassword, String newPassword) {
-//        UserDTO userDTO = UserUtils.getCurrentUserDTO ( );
-//        if ( StrUtil.isNotBlank ( oldPassword ) && StrUtil.isNotBlank ( newPassword ) ) {
-//            if ( SecurityUtils.validatePassword ( oldPassword, userDTO.getPassword ( ) ) ) {
-//                User user = new User ( userDTO.getId ( ) );
-//                user.setPassword ( SecurityUtils.encryptPassword ( newPassword ) );
-//                user.setUpPassword("1"); // 密码修改状态改为”已修改“
-//                userService.updateById ( user );
-//                UserUtils.deleteCache ( userDTO );
-//                return ResponseEntity.ok ( "修改密码成功！" );
-//            } else {
-//                return ResponseEntity.badRequest ( ).body ( "修改密码失败，旧密码错误！" );
-//            }
-//        }
-//        return ResponseEntity.badRequest ( ).body ( "参数错误！" );
-//    }
-
     @DemoMode
     @ApiLog("修改密码")
     @RequestMapping("savePwd")
     @ApiOperation(value = "修改密码")
+    public ResponseEntity savePwd(String oldPassword, String newPassword) {
+        UserDTO userDTO = UserUtils.getCurrentUserDTO ( );
+        if ( StrUtil.isNotBlank ( oldPassword ) && StrUtil.isNotBlank ( newPassword ) ) {
+            if ( SecurityUtils.validatePassword ( oldPassword, userDTO.getPassword ( ) ) ) {
+                User user = new User ( userDTO.getId ( ) );
+                user.setPassword ( SecurityUtils.encryptPassword ( newPassword ) );
+                user.setUpPassword("1"); // 密码修改状态改为”已修改“
+                userService.updateById ( user );
+                UserUtils.deleteCache ( userDTO );
+                return ResponseEntity.ok ( "修改密码成功！" );
+            } else {
+                return ResponseEntity.badRequest ( ).body ( "修改密码失败，旧密码错误！" );
+            }
+        }
+        return ResponseEntity.badRequest ( ).body ( "参数错误！" );
+    }
+
+    /*@DemoMode
+    @ApiLog("修改密码")
+    @RequestMapping("savePwd")
+    @ApiOperation(value = "修改密码")
     public ResponseEntity savePwd(String newPassword) {
         UserDTO userDTO = UserUtils.getCurrentUserDTO ( );
         //调用服务端的修改密码接口
@@ -593,7 +593,7 @@ public class UserController {
 
         return ResponseEntity.ok ( "修改密码成功！" );
 
-    }
+    }*/
 
 
     /**

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -114,7 +114,7 @@
 		a.login_date AS "loginDate",
 		a.remarks,
 		a.login_flag,
+ 		a.other_service_flag,
 		a.photo,
 		a.qr_code,
 		a.sign,