调整

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/borrow/service/BorrowService.java

@@ -89,7 +89,7 @@ public class BorrowService {
         for (BorrowDTO item : pageList.getRecords()){
             if (CollectionUtils.isNotEmpty(borrowList)){
                 for (JyReimbursementDetailInfoBorrow infoBorrow : borrowList) {
-                    if (item.getId().equals(infoBorrow.getProjectId())){
+                    if (item.getId().equals(infoBorrow.getProjectId()) && infoBorrow.getStatus().equals("5")){
                         if (StringUtils.isNotBlank(item.getFinalMoney())){
                             Float moneyLower=Float.parseFloat(item.getFinalMoney());
                             Float number=Float.parseFloat(infoBorrow.getNumber());

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/monthly/service/MonthlyService.java

@@ -111,10 +111,10 @@ public class MonthlyService {
         }else {
             String mid = UUID.randomUUID().toString().replace("-", "");
             //先往月报表中添加一条数据
-            Monthly monthly = new Monthly();
-            monthly.setId(mid);
-            monthly.setIfsubmit("0");
-            monthlyMapper.insert(monthly);
+//            Monthly monthly = new Monthly();
+//            monthly.setId(mid);
+//            monthly.setIfsubmit("0");
+//            monthlyMapper.insert(monthly);
 
             monthlyDTO.setId(mid);
             //获取当前登录人信息
@@ -231,6 +231,7 @@ public class MonthlyService {
             String name=userDTO.getName()+split[0]+"年"+split[1]+"月月报";
             monthly.setName(name);
             monthlyMapper.updateById(monthly);
+
             //修改附件
             List<WorkAttachmentInfo> files = monthlyDTO.getFiles();
             updateFiles(files, userDTO, monthlyDTO.getId());

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/payment/service/PaymentService.java

@@ -87,7 +87,7 @@ public class PaymentService {
         List<JyReimbursementDetailInfoPayment> list = jyReimbursementInfoPaymentMapper.getList();
         list.stream().forEach(item->{
             pageList.getRecords().stream().forEach(data->{
-                if (item.getProjectId().equals(data.getId())){
+                if (item.getProjectId().equals(data.getId()) && item.getStatus().equals("5")){
                     Float moneyLower=Float.parseFloat(data.getPaymentLower());
                     Float number=Float.parseFloat(item.getNumber());
                     Float money=moneyLower-number;

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/mapper/xml/ProjectListMapper.xml

@@ -791,7 +791,7 @@
 	</select>
 
     <select id="getByCreate" resultType="com.jeeplus.business.project.domain.JyProject">
-        SELECT
+        SELECT distinct
            a.id,
            a.create_by_id as create_by,
            a.create_time,
@@ -821,16 +821,14 @@
            (SELECT su.name from sys_user su where a.project_leader = su.id) as projectLeader,
            a.proc_ins_id,
            a.process_definition_id,
-           wci.no as contractNo,
-           wci.contract_amount as contractAmount,
            b.name AS create_by_id
         FROM
             jy_project_record a
             LEFT JOIN sys_user b ON a.create_by_id = b.id
             LEFT JOIN sys_user c ON a.project_leader = c.id
-            left join jy_project_audit pa on a.id=pa.project_id and pa.audit_level = '3'
-            LEFT JOIN jy_work_contract_info wci ON wci.id = a.contract_id and wci.del_flag = '0'
-             ${ew.customSqlSegment}
+            left join jy_project_outinstance po on a.id=po.project_id
+            left join jy_project_members pm on a.id = pm.project_id
+             where (pm.user_id = #{id} or a.create_by_id = #{id}) and a.status = '5'
             ORDER BY a.update_time DESC
     </select>
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/project/service/JyProjectService.java

@@ -705,8 +705,8 @@ public class JyProjectService {
         //获取当前登录人信息
         UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken());
         QueryWrapper<JyProject> wrapper = QueryWrapperGenerator.buildQueryCondition(info, JyProject.class);
-        wrapper.eq("a.create_by_id",userDTO.getId());
-        wrapper.eq("pa.status","5");
+//        wrapper.eq("a.create_by_id",userDTO.getId());
+//        wrapper.eq("pa3.status","5");
         //创建时间
         if (info.getCreateDates() != null && info.getCreateDates().length > 0) {
             wrapper.between("a.create_time", info.getCreateDates()[0], info.getCreateDates()[1]);

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/domain/JyReimbursementDetailInfoBorrow.java

@@ -1,5 +1,6 @@
 package com.jeeplus.business.reimbursement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -81,4 +82,7 @@ public class JyReimbursementDetailInfoBorrow extends BaseEntity {
      * 借款金额
      */
     private String moneyLower;
+
+    @TableField(exist = false)
+    private String status;
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/domain/JyReimbursementDetailInfoPayment.java

@@ -1,5 +1,6 @@
 package com.jeeplus.business.reimbursement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -81,4 +82,7 @@ public class JyReimbursementDetailInfoPayment extends BaseEntity {
      * 付款金额
      */
     private String paymentLower;
+
+    @TableField(exist = false)
+    private String status;
 }

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/mapper/xml/JyReimbursementInfoBorrowMapper.xml

@@ -14,8 +14,10 @@
             a.project_id,
             a.report_number,
             a.number,
+            ri.status,
             a.money_lower
         from jy_reimbursement_detail_info_borrow a
+        left join jy_reimbursement_info ri on a.info_id = ri.id
         where a.del_flag = '0'
     </select>
 

jeeplus-modules/jeeplus-business/src/main/java/com/jeeplus/business/reimbursement/mapper/xml/JyReimbursementInfoPaymentMapper.xml

@@ -14,7 +14,9 @@
     a.project_id,
     a.report_number,
     a.number,
+    ri.status,
     a.payment_lower
     from jy_reimbursement_detail_info_payment a
+    left join jy_reimbursement_info ri on a.info_id = ri.id
     </select>
 </mapper>

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/MyNoticeController.java

@@ -12,6 +12,7 @@ import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.dto.UserDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import liquibase.pro.packaged.S;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,8 +45,8 @@ public class MyNoticeController {
 
     @ApiOperation(value = "修改已读状态")
     @GetMapping("/update")
-    public String update(String taskId, String noticeId) {
-        return service.update(taskId, noticeId);
+    public String update(String taskId, String noticeId,String id) {
+        return service.update(taskId, noticeId,id);
     }
 
     @ApiOperation(value = "库存提醒修改已读状态")

jeeplus-modules/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/MyNoticeService.java

@@ -157,9 +157,9 @@ public class MyNoticeService {
         return "操作成功";
     }
 
-    public String update(String taskId, String noticeId) {
+    public String update(String taskId, String noticeId,String id) {
         LambdaQueryWrapper<MyNoticeList> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BaseEntity::getDelFlag, 0).eq(MyNoticeList::getTaskId, taskId).eq(MyNoticeList::getNoticeName, noticeId).eq(MyNoticeList::getType, 0);
+        wrapper.eq(BaseEntity::getDelFlag, 0).eq(MyNoticeList::getTaskId, taskId).eq(MyNoticeList::getNoticeName, noticeId).eq(MyNoticeList::getType, 0).eq(MyNoticeList::getId,id);
         MyNoticeList one = mapper.selectInfo(wrapper);
         if (one != null) {
             one.setType("1");