Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/invoice/service/CwFinanceInvoiceService.java

@@ -37,8 +37,6 @@ import com.jeeplus.sys.feign.IWorkAttachmentApi;
 //import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
-//import com.jeeplus.sys.utils.UserUtils;
-import com.jeeplus.sys.utils.UserUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -282,8 +280,6 @@ public class CwFinanceInvoiceService extends ServiceImpl<CwFinanceInvoiceMapper,
         // 如果当前用户是部门主任，则可以查看部门所有的项目、自己创建的项目以及所属项目组的项目
         // 如果当前用户是员工，则可以查看自己创建的项目以及所属项目组的项目
         StringBuilder officeIds = new StringBuilder();
-        UserDTO userDTO = UserUtils.getCurrentUserDTO();
-//        queryWrapper.eq("",userDTO.getId());
 //        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         List<String> manageOfficeIdList= Lists.newArrayList();
         //判定是否为会计所长

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectBusinessType/service/CwProjectBusinessTypeService.java

@@ -31,7 +31,6 @@ public class CwProjectBusinessTypeService extends ServiceImpl<CwProjectBusinessT
 
     public IPage<CwProjectBusinessTypeDTO> findList(Page<CwProjectBusinessTypeDTO> page, QueryWrapper<CwProjectBusinessType> queryWrapper){
         queryWrapper.eq("cw_pbt.del_flag","0").orderByAsc("cw_pbt.sort_mark");
-        IPage<CwProjectBusinessTypeDTO> list = cwProjectBusinessTypeMapper.findList(page, queryWrapper);
         return cwProjectBusinessTypeMapper.findList(page,queryWrapper);
     }
 

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectRecords/service/CwProjectRecordsService.java

@@ -37,7 +37,6 @@ import com.jeeplus.finance.workClientInfo.service.dto.CwWorkClientBaseDTO;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
-import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
@@ -80,8 +79,6 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
     @Resource
     private CwProjectMembersService cwProjectMembersService;
 
-    @Resource
-    private UserService userService;
 
     /**
      * 差选项目列表信息
@@ -143,7 +140,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
                 //根据项目经理1的id去查项目经理去名称
                 if (StringUtils.isNotBlank(li.getProjectMasterId())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMasterId().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -158,7 +155,7 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
             if (StringUtils.isBlank(li.getRealHeaderName())) {
                 if (StringUtils.isNotBlank(li.getRealHeader())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getRealHeader().equals(user.getId())) {
                             matchingUser = user;
                             break;

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

@@ -92,7 +92,8 @@ public class CwProjectReportController {
     @PostMapping("saveSignFiles")
     public ResponseEntity saveSignFiles(@RequestBody CwProjectReportData reportData) {
         System.out.println("进入controller前");
-        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+        //UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
+        UserDTO userDTO = new UserDTO();
         if (CollectionUtil.isEmpty(reportData.getCwFileInfoList())) {
             reportData.setCwFileInfoList(new ArrayList<>());
         }

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

@@ -34,7 +34,7 @@ public class CwProjectReportReviewController {
      * @return
      */
     @ApiLog(value = "保存财务报告信息-流程", type = LogTypeEnum.SAVE)
-    @PreAuthorize("hasAnyAuthority('cwProjectReportReview:add','cwProjectReportReview:edit')")
+    //@PreAuthorize("hasAnyAuthority('cwProjectReportReview:add','cwProjectReportReview:edit')")
     @PostMapping("saveForm")
     public ResponseEntity saveForm(@Valid @RequestBody CwProjectReportData reportData) throws Exception {
         String id = service.saveForm(reportData);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/ProjectReportWorkAttachmentMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.finance.projectReport.domain.CwProjectReportFile;
 import com.jeeplus.finance.projectReport.service.dto.ProjectReportWorkAttachmentDTO;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
+import com.jeeplus.sys.service.dto.UserDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -51,4 +52,12 @@ public interface ProjectReportWorkAttachmentMapper extends BaseMapper<CwProjectR
      * @return
      */
     Integer updateByIdOnSignature(WorkAttachmentInfo workattachment);
+
+    /**
+     * 签章保存附件信息
+     * @param workAttachment
+     * @param userDto
+     */
+    @InterceptorIgnore(tenantLine = "true")
+    void insertWorkAttachment (@Param("workAttachment") WorkAttachmentInfo workAttachment, @Param("userDto") UserDTO userDto);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/xml/ProjectReportWorkAttachmentMapper.xml

@@ -50,4 +50,37 @@
         where report_file_id = #{id}
     </update>
 
+
+    <insert id="insertWorkAttachment">
+        INSERT INTO work_attachment (
+            id,
+            create_by_id,
+            create_time,
+            update_by_id,
+            update_time,
+            del_flag,
+            url,
+            type,
+            attachment_id,
+            attachment_name,
+            attachment_flag,
+            file_size,
+            sort
+            )
+        VALUES(
+            #{workAttachment.id},
+            #{userDto.id},
+            #{workAttachment.createTime},
+            #{userDto.id},
+            #{workAttachment.updateTime},
+            #{workAttachment.delFlag},
+            #{workAttachment.url},
+            #{workAttachment.type},
+            #{workAttachment.attachmentId},
+            #{workAttachment.attachmentName},
+            #{workAttachment.attachmentFlag},
+            #{workAttachment.fileSize},
+            #{workAttachment.sort}
+            )
+    </insert>
 </mapper>

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

@@ -48,7 +48,6 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
 //import com.jeeplus.sys.service.UserService;
 //import com.jeeplus.sys.mapper.UserMapper;
-import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.sys.utils.DictUtils;
 //import com.jeeplus.sys.utils.Global;
@@ -130,9 +129,6 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
     @Resource
     private CwProjectRecordsService cwProjectRecordsService;
 
-    @Resource
-    private UserService userService;
-
 
     /**
      * 保存项目以及其他相关信息
@@ -544,7 +540,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 //根据项目经理1的id去查项目经理去名称
                 if (StringUtils.isNotBlank(li.getProjectMasterId())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMasterId().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -560,7 +556,7 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
             if (StringUtils.isBlank(li.getRealHeaderName())) {
                 if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMaster2Id().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -2548,12 +2544,14 @@ public class CwProjectReportService extends ServiceImpl<CwProjectReportMapper, C
                 i.setSort(j);
 //                ossServiceMapper.insertWorkAttachment(i, userDTO);
 
-                Map<String,String> map = new HashMap<>();
+                /*Map<String,String> map = new HashMap<>();
                 String workAttachment = JSON.toJSONString((i));
                 String userDTOInfo = JSON.toJSONString((userDTO));
                 map.put("workAttachment",workAttachment);
-                map.put("userDTO",userDTOInfo);
-                SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
+                map.put("userDTO",userDTOInfo);*/
+                //附件信息保存
+                attachmentMapper.insertWorkAttachment(i,userDTO);
+                //SpringUtil.getBean ( IWorkAttachmentApi.class ).insertWorkAttachment(map);
 
                 CwProjectReportFile reportFile = new CwProjectReportFile();
                 BeanUtils.copyProperties(dto, reportFile);

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApply/service/ReportCancellApplyService.java

@@ -29,7 +29,6 @@ import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.IUserApi;
-import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.sys.utils.UserUtils;
@@ -75,8 +74,6 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
     @Resource
     private CwProjectReportService projectReportService;
 
-    @Resource
-    private UserService userService;
 
     /**
      * 差选项目列表信息
@@ -168,7 +165,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
                 //根据项目经理1的id去查项目经理去名称
                 if (StringUtils.isNotBlank(li.getProjectMasterId())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMasterId().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -182,7 +179,7 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
             } else if (StringUtils.isBlank(li.getProjectMaster2Name())) {
                 if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMaster2Id().equals(user.getId())) {
                             matchingUser = user;
                             break;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reportCancellApplyArchived/service/ReportCancellApplyArchivedService.java

@@ -34,7 +34,6 @@ import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.feign.IWorkAttachmentApi;
-import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 //import com.jeeplus.sys.utils.UserUtils;
@@ -166,13 +165,12 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
             allUserInfo = SpringUtil.getBean(IUserApi.class).getAllUserInfo();
         }
         List<UserDTO> finalAllUserInfo = allUserInfo;
-        List<UserDTO> finalAllUserInfo1 = allUserInfo;
         list.getRecords().forEach(li -> {
             if (StringUtils.isBlank(li.getProjectMasterName())){
                 //根据项目经理1的id去查项目经理去名称
                 if (StringUtils.isNotBlank(li.getProjectMasterId())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMasterId().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -186,7 +184,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
 
                 if (StringUtils.isNotBlank(li.getProjectMaster2Id())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getProjectMaster2Id().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -201,7 +199,7 @@ public class ReportCancellApplyArchivedService extends ServiceImpl<ReportCancell
                 if (StringUtils.isBlank(li.getReportSponsor())) {
                     if (StringUtils.isNotBlank(li.getReportSponsorId())){
                         UserDTO matchingUser = null;
-                        for (UserDTO user : allUserInfo) {
+                        for (UserDTO user : finalAllUserInfo) {
                             if (li.getReportSponsorId().equals(user.getId())) {
                                 matchingUser = user;
                                 break;

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/workClientInfo/controller/CwWorkClientController.java

@@ -84,13 +84,14 @@ public class CwWorkClientController {
                 }
             }
         });
+        List<UserDTO> finalAllUserInfo = allUserInfo;
         result.getRecords().forEach(li -> {
             if (StringUtils.isBlank(li.getCreateBy().getName())){
                 //根据项目经理1的id去查项目经理去名称
                 UserDTO createBy = li.getCreateBy();
                 if (StringUtils.isNotBlank(li.getCreateBy().getId())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (createBy.getId().equals(user.getId())) {
                             matchingUser = user;
                             break;
@@ -105,7 +106,7 @@ public class CwWorkClientController {
             } else if (StringUtils.isBlank(li.getUpdateUserName())) {
                 if (StringUtils.isNotBlank(li.getUpdateUser())){
                     UserDTO matchingUser = null;
-                    for (UserDTO user : allUserInfo) {
+                    for (UserDTO user : finalAllUserInfo) {
                         if (li.getUpdateUser().equals(user.getId())) {
                             matchingUser = user;
                             break;

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -101,7 +101,7 @@
 			left join material_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
 			GROUP BY a.trade_name,a.ware_house_type
-			ORDER BY a.ware_house_type DESC
+			ORDER BY a.ware_house_type DESC,a.trade_name
 	</select>
     <select id="findRequestId" resultType="java.lang.String">
 		select id from material_management_pruchase_request_basics where purchase_no = #{purchaseNo} and del_flag = 0