财务-bug修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/domain/ContractInfo.java

@@ -183,6 +183,5 @@ public class ContractInfo extends BaseEntity {
     /**
      * 创建时间
      */
-    @TableField(exist = false)
     private Date createDate;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/ContractInfoMapper.java

@@ -63,4 +63,5 @@ public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
     // 没有使用客户id作为参数，而是直接查询，是因为 合同与客户的关联表 中没有 客户id 的字段，只有客户编号的字段
     List<String> getClientListByClientNo(@Param("no") String no);
 
+    void updateBorrowTypeById(@Param("id") String id, @Param("status")String status);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/CwWorkContractBorrowMapper.java

@@ -25,4 +25,5 @@ public interface CwWorkContractBorrowMapper extends BaseMapper<CwWorkContractBor
 
     List<CwWorkContractBorrowMessage> findMessageList(@Param("id") String id);
 
+    CwWorkContractBorrow selectByInfoId(String id);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/ContractInfoMapper.xml

@@ -15,6 +15,9 @@
     <update id="updatefiledPaperTypeById">
         UPDATE cw_work_contract_info SET `filed_paper_type` = #{status} WHERE del_flag = 0 AND id = #{id}
     </update>
+    <update id="updateBorrowTypeById">
+        UPDATE cw_work_contract_info SET `borrow_type` = #{status} WHERE del_flag = 0 AND id = #{id}
+    </update>
 
     <select id="findPageList" resultType="com.jeeplus.test.cw.contractRegistration.domain.ContractInfo">
         SELECT

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/CwWorkContractBorrowMapper.xml

@@ -42,4 +42,8 @@
 		 FROM cw_work_contract_borrow_message WHERE del_flag = 0 AND contract_borrow_id = #{id}
 		 order by create_date desc
     </select>
+    <select id="selectByInfoId"
+            resultType="com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrow">
+        select * from cw_work_contract_borrow where contract_info_id = #{id}
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractFilePaperService.java

@@ -34,7 +34,7 @@ public class ContractFilePaperService {
         if (null != info) {
             filePaper.setFileCreateName(filePaper.getCreateBy());
             filePaper.setCreateBy(filePaper.getCreateId());
-            infoMapper.updatefiledTypeById(filePaper.getContractInfoId(),filePaper.getFiledPaperType());
+            infoMapper.updatefiledPaperTypeById(info.getContractInfoId(),filePaper.getFiledPaperType());
             return update(filePaper, info.getId());
         }else {
             return add(filePaper);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractFileService.java

@@ -63,7 +63,7 @@ public class ContractFileService {
         if (null != info) {
             contractFile.setFileCreateName(contractFile.getCreateBy());
             contractFile.setCreateBy(contractFile.getCreateId());
-            infoMapper.updatefiledTypeById(contractFile.getContractInfoId(),contractFile.getFiledType());
+            infoMapper.updatefiledTypeById(info.getContractInfoId(),contractFile.getFiledType());
             return update(contractFile, info.getId());
         }else {
             return add(contractFile);

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/ContractInfoService.java

@@ -109,8 +109,8 @@ public class ContractInfoService {
             wrapper.between("a.signing_date", contractDates[0], contractDates[1]);
         }
         //5、创建人
-        if (StringUtils.isNotEmpty(info.getContractName())) {
-            wrapper.like("a.contract_name", info.getContractName());
+        if (StringUtils.isNotEmpty(info.getCreateBy())) {
+            wrapper.like("c.`id`", info.getCreateBy());
         }
         //6、所属部门
         if (StringUtils.isNotEmpty(info.getDepartment())) {
@@ -131,6 +131,10 @@ public class ContractInfoService {
         if (StringUtils.isNotEmpty(info.getFiledType())) {
             wrapper.like("a.filed_type", info.getFiledType());
         }
+        //纸质归档
+        if (StringUtils.isNotEmpty(info.getFiledPaperType())) {
+            wrapper.like("a.filed_paper_type", info.getFiledPaperType());
+        }
         wrapper.eq("a.del_flag","0");
         IPage<ContractInfo> pageList = mapper.findPageList(page, wrapper);
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/CwWorkContractBorrowService.java

@@ -6,6 +6,7 @@ import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrow;
 import com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrowMessage;
+import com.jeeplus.test.cw.contractRegistration.mapper.ContractInfoMapper;
 import com.jeeplus.test.cw.contractRegistration.mapper.CwWorkContractBorrowMapper;
 import com.jeeplus.test.cw.contractRegistration.mapper.CwWorkContractBorrowMessageMapper;
 import com.jeeplus.test.cw.contractRegistration.service.dto.CwWorkContractBorrowDto;
@@ -30,10 +31,14 @@ public class CwWorkContractBorrowService {
     @Resource
     private CwWorkContractBorrowMessageMapper messageMapper;
 
+    @Resource
+    private ContractInfoMapper infoMapper;
+
     public String saveInfo(CwWorkContractBorrowDto workContractBorrowDto) throws Exception {
         if (StringUtils.isNotEmpty(workContractBorrowDto.getId())) {
             CwWorkContractBorrow info = borrowMapper.selectById( workContractBorrowDto.getId());
             if (info != null) {
+                infoMapper.updateBorrowTypeById(info.getContractInfoId(),workContractBorrowDto.getBorrowType());
                 return update(workContractBorrowDto, info.getContractInfoId());
             }
         }
@@ -86,6 +91,7 @@ public class CwWorkContractBorrowService {
     }
 
     public void updateStatusByContractInfoId(CwWorkContractBorrowDto workContractBorrowDto) {
+        infoMapper.updateBorrowTypeById(workContractBorrowDto.getId(),workContractBorrowDto.getBorrowType());
         borrowMapper.updateStatusByContractInfoId(workContractBorrowDto.getId(), workContractBorrowDto.getBorrowType());
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/ReportCancellApplyService.java

@@ -76,10 +76,10 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         queryWrapper.orderByDesc("a.create_date");
         //条件
         if (StringUtils.isNotEmpty(projectReportData.getProjectNumber())) {
-            queryWrapper.like("b.project_number", projectReportData.getProjectNumber());
+            queryWrapper.like("d.project_number", projectReportData.getProjectNumber());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectName())) {
-            queryWrapper.like("b.project_name", projectReportData.getProjectName());
+            queryWrapper.like("d.project_name", projectReportData.getProjectName());
         }
         if (StringUtils.isNotEmpty(projectReportData.getProjectMasterId())) {
             queryWrapper.eq("d.project_master_id", projectReportData.getProjectMasterId());
@@ -87,7 +87,12 @@ public class ReportCancellApplyService extends ServiceImpl<ReportCancellApplyMap
         if (StringUtils.isNotEmpty(projectReportData.getCreateBy().getId())) {
             queryWrapper.like("a.create_by", projectReportData.getCreateBy().getId());
         }
+        //创建时间
+        String[] contractDates = projectReportData.getContractDates();
+        if (contractDates != null) {
 
+            queryWrapper.between("a.create_date", contractDates[0], contractDates[1]);
+        }
         IPage<ReportInfoDto> list = applyMapper.getList(page, queryWrapper);
         return list;
     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/reportCancellApply/service/dto/ReportInfoDto.java

@@ -88,4 +88,10 @@ public class ReportInfoDto extends BaseDTO {
     private String procInsId;
 
     private String processDefinitionId;
+
+    /**
+     * 创建时间区间
+     */
+    @TableField(exist = false)
+    private String[] contractDates;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/MaterialBasicMapper.java

@@ -22,4 +22,6 @@ public interface MaterialBasicMapper extends BaseMapper<MaterialBasic> {
     IPage<MaterialInfoDto> findList(Page<MaterialInfoDto> page,@Param(Constants.WRAPPER) QueryWrapper<MaterialInfoDto> queryWrapper);
 
     void updateStatusById(@Param("id") String id, @Param("type") String type);
+
+    String getHandledName(String handledBy);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/mapper/xml/MaterialBasicMapper.xml

@@ -37,4 +37,7 @@
 	<select id="findChildIds" resultType="java.lang.String">
 		select id from sys_office where parent_id = #{department}
 	</select>
+	<select id="getHandledName" resultType="java.lang.String">
+		select name from sys_user where id = #{handledBy}
+	</select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/service/MaterialService.java

@@ -62,9 +62,6 @@ public class MaterialService {
         if (StringUtils.isNotEmpty(dto.getPurchaseSketch())) {
             queryWrapper.like("a.purchase_sketch", dto.getPurchaseSketch());
         }
-        if (StringUtils.isNotEmpty(dto.getHandledBy())) {
-            queryWrapper.eq("a.handled_by", dto.getHandledBy());
-        }
         if (StringUtils.isNotEmpty(dto.getHandledByOfficeName())) {
             //先根据id查出是否是父节点，是父节点则查出所有的子节点信息
             List<String> childIds = basicMapper.findChildIds(dto.getHandledByOfficeName());
@@ -82,6 +79,13 @@ public class MaterialService {
         if (StringUtils.isNotEmpty(dto.getProcurementType())) {
             queryWrapper.like("b.procurement_type", dto.getProcurementType());
         }
+        //经办人
+        if (StringUtils.isNotEmpty(dto.getHandledBy())) {
+            //根据经办人id查出经办人名称
+            String name = basicMapper.getHandledName(dto.getHandledBy());
+            dto.setHandledBy(name);
+            queryWrapper.eq("a.handled_by", dto.getHandledBy());
+        }
         //合同金额
         //3、合同金额（区间）
         String[] contractAmounts = dto.getContractAmounts();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/mapper/ReimbursementInfoMapper.java

@@ -28,4 +28,6 @@ public interface ReimbursementInfoMapper extends BaseMapper<ReimbursementInfo> {
     List<RetureListDto> findExportList (@Param(Constants.WRAPPER) QueryWrapper queryWrapper);
 
     IPage<RetureListDto> relationReimbursementList (Page<RetureListDto> page, @Param("id") String id);
+
+    List<TreeUserDto> findOfficeListByUserName(String name);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -127,4 +127,11 @@
 			AND a.project_id IN (SELECT id FROM program_project_list_info WHERE del_flag = 0 AND contract_id = #{id})
 		ORDER BY a.update_date DESC
 	</select>
+	<select id="findOfficeListByUserName"
+			resultType="com.jeeplus.test.reimbursement.reimbursementInfo.service.dto.TreeUserDto">
+		SELECT a.id,a.`name`,a.parent_id FROM sys_office a
+		LEFT JOIN sys_user b
+		on a.id = b.office_id
+		WHERE a.del_flag = 0 and b.name = #{name}
+	</select>
 </mapper>

jeeplus-plugins/jeeplus-datascreen/target/generated-sources/annotations/com/jeeplus/datav/service/mapstruct/DataMapWrapperImpl.java

@@ -12,8 +12,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2022-03-20T22:29:58+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_221 (Oracle Corporation)"
+    date = "2022-12-02T14:47:04+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DataMapWrapperImpl implements DataMapWrapper {

jeeplus-plugins/jeeplus-datascreen/target/generated-sources/annotations/com/jeeplus/datav/service/mapstruct/DataScreenCategoryWrapperImpl.java

@@ -10,8 +10,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2022-03-20T22:29:58+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_221 (Oracle Corporation)"
+    date = "2022-12-02T14:47:04+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DataScreenCategoryWrapperImpl implements DataScreenCategoryWrapper {

jeeplus-plugins/jeeplus-datascreen/target/generated-sources/annotations/com/jeeplus/datav/service/mapstruct/DataScreenWrapperImpl.java

@@ -13,8 +13,8 @@ import org.springframework.stereotype.Component;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2022-03-20T22:29:58+0800",
-    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_221 (Oracle Corporation)"
+    date = "2022-12-02T14:47:04+0800",
+    comments = "version: 1.4.1.Final, compiler: javac, environment: Java 1.8.0_211 (Oracle Corporation)"
 )
 @Component
 public class DataScreenWrapperImpl implements DataScreenWrapper {