Merge remote-tracking branch 'origin/master'

jeeplus-common/jeeplus-common-security/src/main/java/com/jeeplus/common/WebSecurityConfig.java

@@ -56,7 +56,13 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 // 基于token，所以不需要session
                 .sessionManagement ( ).sessionCreationPolicy ( SessionCreationPolicy.STATELESS ).and ( )
                 .authorizeRequests ( )
-                .antMatchers ( "/**" ).permitAll ( ) // 允许请求无需认证
+                .antMatchers ( "/**",
+                        "/*/public-modules-server/luckyDraw/events/**",
+                        "/*/api/public-modules-server/luckyDraw/events/**",
+                        "/*/app/luckyDraw/events/**",
+                        "/*/luckyDraw/events/queryById",
+                        "/luckyDraw/events/queryById",
+                        "/*/luckyDraw/**").permitAll ( ) // 允许请求无需认证
                 .antMatchers ( HttpMethod.OPTIONS, "/**" ).permitAll ( )
                 .anyRequest ( ).authenticated ( ) // 所有请求都需要验证
                 .and ( )

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/assessSignatureDaily/controller/AssessDailyOfficeWorkSignatureCallBackController.java

@@ -179,7 +179,7 @@ public class AssessDailyOfficeWorkSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_signature_daily_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/cw_signature_daily_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(org.apache.commons.lang3.StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/assessSignatureDaily/controller/AssessDailyReportSignatureCallBackController.java

@@ -180,7 +180,7 @@ public class AssessDailyReportSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_signature_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/cw_signature_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(org.apache.commons.lang3.StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -321,7 +321,7 @@ public class CwProjectReportSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/cw_project_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(StringUtils.isNotBlank(newName)){
@@ -477,7 +477,7 @@ public class CwProjectReportSignatureCallBackController {
 //                MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
 //                if (cMultiFile != null && !cMultiFile.isEmpty()) {
 //                    // 文件保存路径
-//                    String realPath =DIRECTORY.replace("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
+//                    String realPath =DIRECTORY.replaceFirst("/","")+"/cw_project_report_file"+ossClientService.datePath()+"/"+ System.currentTimeMillis();
 //                    //文件原名称
 //                    String newName = cMultiFile.getOriginalFilename();
 //                    newName = newName.substring(13, newName.length());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/domain/CwProjectReportData.java

@@ -204,10 +204,6 @@ public class CwProjectReportData extends BaseDTO {
      */
     private String processDefinitionId1;
 
-    /**
-     * 公章流程status
-     */
-    @Excel(name = "复核签章状态",width = 20,orderNum = "15")
     private String status1;
 
     /**
@@ -353,6 +349,10 @@ public class CwProjectReportData extends BaseDTO {
     /**
      * 报告复核流程状态
      */
+    /**
+     * 公章流程status
+     */
+    @Excel(name = "复核签章状态",width = 20,orderNum = "15")
     private String reviewStatus;
 
     /**

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportService.java

@@ -719,8 +719,12 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             reportIdList.add(record.getId());
         }
         //根据报告id查询修改签字注师记录表信息
-        List<CwSignatureAnnotator> sigByIdList = cwSignatureAnnotatorMapper.getSigByIdList(reportIdList);
+        List<CwSignatureAnnotator> sigByIdList = new ArrayList<CwSignatureAnnotator>();
+        if(reportIdList.size()>0){
+            sigByIdList = cwSignatureAnnotatorMapper.getSigByIdList(reportIdList);
+        }
 
+        List<CwSignatureAnnotator> finalSigByIdList = sigByIdList;
         list.getRecords().forEach(li->{
             if (StringUtils.isBlank(li.getProjectMasterName())){
                 //根据项目经理1的id去查项目经理去名称
@@ -763,7 +767,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 li.setSigReason(sigById.getReason());
                 li.setTaskSigId(sigById.getTaskId());
             }*/
-            for (CwSignatureAnnotator annotator : sigByIdList) {
+            for (CwSignatureAnnotator annotator : finalSigByIdList) {
                 if(li.getId().equals(annotator.getReportId())){
                     li.setProcInsSigId(annotator.getProcInsId());
                     li.setSigReason(annotator.getReason());

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/signatureDaily/controller/DailyOfficeWorkSignatureCallBackController.java

@@ -177,7 +177,7 @@ public class DailyOfficeWorkSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_signature_daily_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/cw_signature_daily_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(org.apache.commons.lang3.StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/signatureDaily/controller/DailyReportSignatureCallBackController.java

@@ -184,7 +184,7 @@ public class DailyReportSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/cw_signature_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/cw_signature_report_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(org.apache.commons.lang3.StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/handover/service/HandoverService.java

@@ -446,7 +446,7 @@ public class HandoverService extends ServiceImpl<HandoverMapper, Handover> {
         MultipartFile cMultiFile = new MockMultipartFile("file", file.getName(), null, new FileInputStream(file));
         if (!cMultiFile.isEmpty()) {
             // 文件保存路径
-            String realPath =DIRECTORY.replace("/","")+"/human_dimission_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+            String realPath =DIRECTORY.replaceFirst("/","")+"/human_dimission_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
             //文件原名称
             String newName = cMultiFile.getOriginalFilename();
             if(StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/signature/controller/HumanSignatureCallBackController.java

@@ -116,7 +116,7 @@ public class HumanSignatureCallBackController {
                     MultipartFile cMultiFile = new MockMultipartFile("file", f.getName(), null, new FileInputStream(f));
                     if (!cMultiFile.isEmpty()) {
                         // 文件保存路径
-                        String realPath =DIRECTORY.replace("/","")+"/human_dimission_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
+                        String realPath =DIRECTORY.replaceFirst("/","")+"/human_dimission_file"+SpringUtil.getBean ( IWorkAttachmentApi.class ).datePath()+"/"+ System.currentTimeMillis();
                         //文件原名称
                         String newName = cMultiFile.getOriginalFilename();
                         if(StringUtils.isNotBlank(newName)){

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/luckyDraw/controller/LuckyDrawEventsController.java

@@ -24,7 +24,7 @@ public class LuckyDrawEventsController {
 
 
     @ApiLog("活动列表")
-    @PreAuthorize("hasAuthority('lucky_draw:events:list')")
+    //@PreAuthorize("hasAuthority('lucky_draw:events:list')")
     @GetMapping("list")
     public ResponseEntity<IPage<LuckyDrawEventsDTO>> data(LuckyDrawEventsDTO luckyDrawEventsDTO, Page<LuckyDrawEventsDTO> page) throws Exception {
         IPage<LuckyDrawEventsDTO> result = new Page<LuckyDrawEventsDTO>();
@@ -33,7 +33,7 @@ public class LuckyDrawEventsController {
     }
 
     @ApiLog("查询活动数据详情")
-    @PreAuthorize("hasAnyAuthority('lucky_draw:events:view','lucky_draw:events:add','lucky_draw:events:edit')")
+    //@PreAuthorize("hasAnyAuthority('lucky_draw:events:view','lucky_draw:events:add','lucky_draw:events:edit')")
     @GetMapping("queryById")
     public ResponseEntity queryById(@RequestParam("id") String id) {
         LuckyDrawEventsDTO luckyDrawEventsDTO = luckyDrawEventsService.queryById ( id );
@@ -41,7 +41,7 @@ public class LuckyDrawEventsController {
     }
 
     @ApiLog(value = "修改/新增活动数据", type = LogTypeEnum.SAVE)
-    @PreAuthorize("hasAnyAuthority('lucky_draw:events:add','lucky_draw:events:edit')")
+    //@PreAuthorize("hasAnyAuthority('lucky_draw:events:add','lucky_draw:events:edit')")
     @PostMapping("save")
     public ResponseEntity save(@Valid @RequestBody LuckyDrawEventsDTO luckyDrawEventsDTO) throws Exception {
         luckyDrawEventsService.saveForm(luckyDrawEventsDTO);
@@ -49,21 +49,21 @@ public class LuckyDrawEventsController {
     }
 
     @ApiLog(value = "删除活动", type = LogTypeEnum.SAVE)
-    @PreAuthorize("hasAuthority('lucky_draw:events:del')")
+    //@PreAuthorize("hasAuthority('lucky_draw:events:del')")
     @DeleteMapping("delete")
     public ResponseEntity delete(String ids) {
         return luckyDrawEventsService.deleteByIds(ids);
     }
 
     @ApiLog("开启活动")
-    @PreAuthorize("hasAnyAuthority('lucky_draw:events:edit')")
+    //@PreAuthorize("hasAnyAuthority('lucky_draw:events:edit')")
     @GetMapping("openEvent")
     public ResponseEntity openEvent(@RequestParam("id") String id) {
         return luckyDrawEventsService.changeSwitchOpen(id);
     }
 
     @ApiLog("关闭活动")
-    @PreAuthorize("hasAnyAuthority('lucky_draw:events:edit')")
+    //@PreAuthorize("hasAnyAuthority('lucky_draw:events:edit')")
     @GetMapping("closeEvent")
     public ResponseEntity closeEvent(@RequestParam("id") String id) {
         return luckyDrawEventsService.changeSwitchClose(id);

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/luckyDraw/mapper/LuckyDrawMembersMapper.java

@@ -21,7 +21,7 @@ public interface LuckyDrawMembersMapper extends BaseMapper<LuckyDrawMembers> {
 
     IPage<LuckyDrawMembersDto> findList(Page<LuckyDrawMembersDto> page, @Param(Constants.WRAPPER) QueryWrapper<LuckyDrawMembersDto> queryWrapper);
 
-    Integer getByName(LuckyDrawMembersDto dto);
+    Integer getByPhone(LuckyDrawMembersDto dto);
 
     int getByNameAndId(String name, String eventId);
 

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/luckyDraw/mapper/xml/LuckyDrawMembersMapper.xml

@@ -18,11 +18,11 @@
 			${ew.customSqlSegment}
 		ORDER BY a.update_time DESC
     </select>
-    <select id="getByName" resultType="java.lang.Integer">
+    <select id="getByPhone" resultType="java.lang.Integer">
 		select count(1) from lucky_draw_members
 		<where>
 			del_flag = 0 and
-			name = #{name}
+			phone = #{phone}
 			and event_id = #{eventId}
 			<if test="id != null and id != ''">
 				and id != #{id}

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/luckyDraw/service/LuckyDrawMembersService.java

@@ -38,7 +38,7 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
 
     public Integer findMobilePhoneOnly(String phone) throws Exception {
         // 删除基础信息表
-        Integer integer = membersMapper.selectCount(new QueryWrapper<LuckyDrawMembers>().eq("phone",phone));
+        Integer integer = membersMapper.selectCount(new QueryWrapper<LuckyDrawMembers>().eq("phone", phone));
         return integer;
     }
 
@@ -48,28 +48,29 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
     }
 
     public ResponseEntity deleteByIds(String ids) {
-        String idArray[] =ids.split(",");
+        String idArray[] = ids.split(",");
         ArrayList<String> strings = Lists.newArrayList(idArray);
         if (CollectionUtil.isNotEmpty(strings)) {
             // 删除活动
-            this.removeByIds (strings);
+            this.removeByIds(strings);
             // 根据活动id删除奖项数据
-            membersMapper.delete(new QueryWrapper<LuckyDrawMembers>().lambda().in(LuckyDrawMembers::getId,strings));
+            membersMapper.delete(new QueryWrapper<LuckyDrawMembers>().lambda().in(LuckyDrawMembers::getId, strings));
         }
 
-        return ResponseEntity.ok ("删除成功");
+        return ResponseEntity.ok("删除成功");
     }
 
-    public String save(LuckyDrawMembersDto dto) throws Exception{
+    public String save(LuckyDrawMembersDto dto) throws Exception {
         // 获取当前登录人信息
-        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());;
+        UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById("1");
         if (StringUtils.isNotEmpty(dto.getId())) {
             return update(dto, userDTO);
         } else {
             return add(dto, userDTO);
         }
     }
-    public String add(LuckyDrawMembersDto dto, UserDTO userDTO) throws Exception{
+
+    public String add(LuckyDrawMembersDto dto, UserDTO userDTO) throws Exception {
         // 生成id
         String id = UUID.randomUUID().toString().replace("-", "");
         LuckyDrawMembers members = new LuckyDrawMembers();
@@ -81,10 +82,10 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
         members.setUpdateTime(new Date());
         members.setDelFlag(0);
         //插入前先看库中是否有对应的用户名称
-        Integer drawMembersCount = membersMapper.getByName(dto);
-        if (drawMembersCount == 0){
+        Integer drawMembersCount = membersMapper.getByPhone(dto);
+        if (drawMembersCount == 0) {
             membersMapper.insert(members);
-        }else {
+        } else {
             return "1";
         }
         return id;
@@ -97,10 +98,10 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
         members.setUpdateById(userDTO.getId());
         members.setUpdateTime(new Date());
         //插入前先看库中是否有对应的用户名称
-        Integer drawMembersCount = membersMapper.getByName(dto);
-        if (drawMembersCount == 0){
+        Integer drawMembersCount = membersMapper.getByPhone(dto);
+        if (drawMembersCount == 0) {
             membersMapper.updateById(members);
-        }else {
+        } else {
             return "1";
         }
 
@@ -117,7 +118,7 @@ public class LuckyDrawMembersService extends ServiceImpl<LuckyDrawMembersMapper,
     /**
      * 列表查询
      */
-    public IPage<LuckyDrawMembersDto> list(Page<LuckyDrawMembersDto> page , LuckyDrawMembersDto dto) throws Exception{
+    public IPage<LuckyDrawMembersDto> list(Page<LuckyDrawMembersDto> page, LuckyDrawMembersDto dto) throws Exception {
         QueryWrapper<LuckyDrawMembersDto> queryWrapper = QueryWrapperGenerator.buildQueryCondition(dto, LuckyDrawMembersDto.class);
 
         queryWrapper.eq("a.del_flag", "0");

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssController.java

@@ -63,7 +63,7 @@ public class OssController {
         //取得上传文件
         if (file != null && !file.isEmpty()) {
             // 文件保存路径
-            String realPath =DIRECTORY.replace("/","")+"/"+storeAs+ossClientService.datePath()+"/"+ System.currentTimeMillis();
+            String realPath =DIRECTORY.replaceFirst("/","")+"/"+storeAs+ossClientService.datePath()+"/"+ System.currentTimeMillis();
             //文件原名称
             String newName = file.getOriginalFilename();
             ossClientService.uploadFile2OSS(file.getInputStream(),realPath,newName);

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -14,6 +14,7 @@
         <result property="photo" column="photo"/>
         <result property="sign" column="sign"/>
         <result property="remarks" column="remarks"/>
+        <result property="otherServiceFlag" column="other_service_flag"/>
         <result property="loginFlag" column="login_flag"/>
         <result property="loginIp" column="loginIp"/>
         <result property="isAdmin" column="isAdmin"/>