财务管理发票bug修补 项目管理业务类型 排序号和业务类型添加

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -46,6 +46,7 @@
             <result property="taskId" column="task_id" jdbcType="VARCHAR"/>
             <result property="isMultiple" column="is_multiple" jdbcType="VARCHAR"/>
             <result property="billingId" column="billing_id" jdbcType="VARCHAR"/>
+            <result property="billingId" column="billing_id" jdbcType="VARCHAR"/>
             <association property="financeInvoiceInvalidDTO" column="id" select="getFii" javaType="com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceInvalidDTO"></association>
             <collection property="financeInvoiceReceivablesDTOList" column="id" select="getFirList" ofType="com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceReceivablesDTO"></collection>
             <collection property="financeInvoiceBaseDTOList" column="id" select="getBaseList" ofType="com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceBaseDTO"></collection>
@@ -222,7 +223,9 @@
     <select id="getBaseList" resultType="com.jeeplus.test.cw.invoice.service.dto.CwFinanceInvoiceBaseDTO">
         select
         <include refid="FIB_Column_List"></include>
+        ,cl.report_no as reportNo
         from cw_finance_invoice_base fib
+        left join cw_project_report_new_line cl on fib.program_id = cl.report_id
 
         where fib.del_flag = '0' and fib.invoice_id = ${id}
     </select>
@@ -232,6 +235,7 @@
         <include refid="Base_Column_List"></include>,
         su.name as operator,
         so.name as operator_office,
+        d.ID_ AS task_id,
         (select
         CASE
         WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.program_name))
@@ -247,6 +251,7 @@
         left join sys_user su on fi.create_by = su.id and su.del_flag = '0'
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
+        LEFT JOIN act_ru_task d ON fi.proc_ins_id = d.PROC_INST_ID_
         ${ew.customSqlSegment}
         ORDER BY
         fi.create_date DESC, cfid.number asc

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/service/dto/CwFinanceInvoiceBaseDTO.java

@@ -43,6 +43,11 @@ public class CwFinanceInvoiceBaseDTO extends BaseDTO {
      */
     private String contractId;
 
+    /**
+     * 报告文号
+     */
+    private String reportNo;
+
     //发票金额
     private String account;
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/service/dto/CwFinanceInvoiceDTO.java

@@ -294,6 +294,8 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      */
     private String invalidTaskId;
 
+    private String taskId;
+
     /**
      * 数据审核人  发票作废
      */
@@ -314,5 +316,10 @@ public class CwFinanceInvoiceDTO extends BaseDTO {
      */
     private String billingId;
 
+    /**
+     * 报告文号
+     * */
+    private String reportNo;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectBusinessType/domain/CwProjectBusinessType.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 
+import javax.validation.constraints.Size;
+
 /**
  * 财务-项目管理-业务类型管理
  * @TableName cw_project_business_type
@@ -42,5 +44,12 @@ public class CwProjectBusinessType extends BaseEntity {
      */
     private String parentIds;
 
+    @Size(min = 1, max = 1)
+    private String isShow;
+    /**
+     * 排序号
+     * */
+    private Integer sortMark;
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectBusinessType/mapper/xml/CwManageLevelTypeMapper.xml

@@ -16,6 +16,8 @@
             <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
             <result property="level" column="level" jdbcType="INTEGER"/>
             <result property="sort" column="sort" jdbcType="INTEGER"/>
+            <result property="isShow" column="is_show" jdbcType="VARCHAR"/>
+            <result property="sortMark" column="sort_mark" jdbcType="INTEGER"/>
             <result property="parentIds" column="parent_ids" jdbcType="VARCHAR"/>
     </resultMap>
 
@@ -30,7 +32,9 @@
         cw_pbt.name,
         cw_pbt.parent_id,
         cw_pbt.level,
-        cw_pbt.sort
+        cw_pbt.sort,
+        cw_pbt.is_show,
+        cw_pbt.sort_mark
     </sql>
 
     <select id="findList" resultMap="BaseResultMap">

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectBusinessType/service/CwProjectBusinessTypeService.java

@@ -33,7 +33,9 @@ public class CwProjectBusinessTypeService extends ServiceImpl<CwProjectBusinessT
     private CwProjectBusinessTypeMapper cwProjectBusinessTypeMapper;
 
     public IPage<CwProjectBusinessTypeDTO> findList(Page<CwProjectBusinessTypeDTO> page, QueryWrapper<CwProjectBusinessType> queryWrapper){
-        queryWrapper.eq("cw_pbt.del_flag","0").orderByAsc("cw_pbt.sort");
+        queryWrapper.eq("cw_pbt.del_flag","0").orderByAsc("cw_pbt.sort_mark");
+        IPage<CwProjectBusinessTypeDTO> list = cwProjectBusinessTypeMapper.findList(page, queryWrapper);
+
         return cwProjectBusinessTypeMapper.findList(page,queryWrapper);
     }
 
@@ -51,17 +53,21 @@ public class CwProjectBusinessTypeService extends ServiceImpl<CwProjectBusinessT
 
     public ResponseEntity saveType(CwProjectBusinessTypeDTO cwProjectBusinessTypeDTO) {
         CwProjectBusinessType cwProjectBusinessType = CwProjectBusinessTypeWrapper.INSTANCE.toEntity(cwProjectBusinessTypeDTO);
+        cwProjectBusinessType.setIsShow(cwProjectBusinessTypeDTO.getIsShow());
+        cwProjectBusinessType.setSortMark(cwProjectBusinessTypeDTO.getSortMark());
         if (ObjectUtil.isNotEmpty(cwProjectBusinessTypeDTO)) {
             if (StringUtils.isBlank(cwProjectBusinessTypeDTO.getId())) {
                 if (StringUtils.isNotBlank(cwProjectBusinessTypeDTO.getParentId())){
                     if ("0".equals(cwProjectBusinessTypeDTO.getParentId())){
                         cwProjectBusinessType.setLevel(1);
+                        cwProjectBusinessType.setIsShow("1");
                         cwProjectBusinessType.setParentIds("0,");
                     }else{
                         CwProjectBusinessType byId = this.getById(cwProjectBusinessTypeDTO.getParentId());
                         CwProjectBusinessTypeDTO pbt = CwProjectBusinessTypeWrapper.INSTANCE.toDTO(byId);
                         if(ObjectUtil.isNotEmpty(pbt)){
                             cwProjectBusinessType.setLevel(pbt.getLevel()+1);
+                            cwProjectBusinessType.setIsShow("1");
                             cwProjectBusinessType.setParentIds(pbt.getParentIds()+pbt.getId()+",");
                         }
                     }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectBusinessType/service/dto/CwProjectBusinessTypeDTO.java

@@ -3,7 +3,9 @@ package com.jeeplus.test.cw.projectBusinessType.service.dto;
 import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.cw.workClientInfo.domain.CwManageLevelType;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
 
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -43,10 +45,19 @@ public class CwProjectBusinessTypeDTO extends BaseDTO {
      */
     private String parentIds;
 
+
+    @Size(min = 1, max = 1)
+    private String isShow;
     /**
      * 子集合
      */
     private List<CwProjectBusinessTypeDTO> childrenList;
 
+    /**
+     * 排序号
+     * */
+    private Integer sortMark;
+
+
     private static final long serialVersionUID = 1L;
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/CwProjectRecordsMapper.java

@@ -11,6 +11,7 @@ import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectClientInfoDTO;
 import com.jeeplus.test.cw.projectRecords.service.dto.CwProjectRecordsDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -40,6 +41,15 @@ public interface CwProjectRecordsMapper extends BaseMapper<CwProjectRecords> {
     CwProjectRecordsDTO queryById(@Param("id") String id);
 
     /**
+     * 查询报告id
+     * */
+    CwProjectRecordsDTO queryById1(@Param("id") String id);
+/**
+ * 判断是 否是项目id
+ */
+    @Select("Select project_id from cw_project_report where id = #{id}")
+    String queryByIdNull(@Param(("id"))String id);
+    /**
      * 根据项目id删除项目相关的所有被服务单位
      * @param projectId
      * @return

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/mapper/xml/CwProjectRecordsMapper.xml

@@ -64,6 +64,7 @@
         <result property="size" column="file_size" jdbcType="VARCHAR"/>
     </resultMap>
 
+
     <sql id="Base_Column_List">
         a.id,
         a.create_by,

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/CwProjectRecordsService.java

@@ -158,36 +158,71 @@ public class CwProjectRecordsService extends ServiceImpl<CwProjectRecordsMapper,
      * @return
      */
     public CwProjectRecordsDTO queryById(String id) {
-        CwProjectRecordsDTO cwProjectRecordsDTO = cwProjectRecordsMapper.queryById(id);
-        if(null != cwProjectRecordsDTO && null != cwProjectRecordsDTO.getCwProjectClientContactDTOList() && cwProjectRecordsDTO.getCwProjectClientContactDTOList().size()>0){
-            for (CwProjectClientContactDTO clientContact : cwProjectRecordsDTO.getCwProjectClientContactDTOList()) {
-                //判断项目联系人是否是从客户联系人中选择出来的
-                if(StringUtils.isNotBlank(clientContact.getClientContactId())){
-                    CwWorkClientContact clientContactInfo = cwWorkClientContactService.getInfoById(clientContact.getClientContactId());
-                    //若数据存在则将查询出来的数据信息进行替换
-                    if(null != clientContactInfo && StringUtils.isNotBlank(clientContactInfo.getId())){
-                        clientContact.setName(clientContactInfo.getName());
-                        clientContact.setSex(clientContactInfo.getSex());
-                        clientContact.setOfficeId(clientContactInfo.getOfficeId());
-                        clientContact.setPosition(clientContactInfo.getPosition());
-                        clientContact.setContactFirst(clientContactInfo.getContactFirst());
-                        clientContact.setContactSecond(clientContactInfo.getContactSecond());
-                        clientContact.setRemarks(clientContactInfo.getRemarks());
-                        clientContact.setFax(clientContactInfo.getFax());
-                        clientContact.setEmail(clientContactInfo.getEmail());
+
+       String queryNull= cwProjectRecordsMapper.queryByIdNull(id);
+        if (queryNull==null){
+            CwProjectRecordsDTO cwProjectRecordsDTO = cwProjectRecordsMapper.queryById(id);
+            if(null != cwProjectRecordsDTO && null != cwProjectRecordsDTO.getCwProjectClientContactDTOList() && cwProjectRecordsDTO.getCwProjectClientContactDTOList().size()>0){
+                for (CwProjectClientContactDTO clientContact : cwProjectRecordsDTO.getCwProjectClientContactDTOList()) {
+                    //判断项目联系人是否是从客户联系人中选择出来的
+                    if(StringUtils.isNotBlank(clientContact.getClientContactId())){
+                        CwWorkClientContact clientContactInfo = cwWorkClientContactService.getInfoById(clientContact.getClientContactId());
+                        //若数据存在则将查询出来的数据信息进行替换
+                        if(null != clientContactInfo && StringUtils.isNotBlank(clientContactInfo.getId())){
+                            clientContact.setName(clientContactInfo.getName());
+                            clientContact.setSex(clientContactInfo.getSex());
+                            clientContact.setOfficeId(clientContactInfo.getOfficeId());
+                            clientContact.setPosition(clientContactInfo.getPosition());
+                            clientContact.setContactFirst(clientContactInfo.getContactFirst());
+                            clientContact.setContactSecond(clientContactInfo.getContactSecond());
+                            clientContact.setRemarks(clientContactInfo.getRemarks());
+                            clientContact.setFax(clientContactInfo.getFax());
+                            clientContact.setEmail(clientContactInfo.getEmail());
+                        }
                     }
                 }
             }
-        }
-        if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
-            if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanStartDate()) && ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanEndDate())) {
-                Date[] planDate = new Date[2];
-                planDate[0] = cwProjectRecordsDTO.getPlanStartDate();
-                planDate[1] = cwProjectRecordsDTO.getPlanEndDate();
-                cwProjectRecordsDTO.setPlanDate(planDate);
+            if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO)) {
+                if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanStartDate()) && ObjectUtil.isNotEmpty(cwProjectRecordsDTO.getPlanEndDate())) {
+                    Date[] planDate = new Date[2];
+                    planDate[0] = cwProjectRecordsDTO.getPlanStartDate();
+                    planDate[1] = cwProjectRecordsDTO.getPlanEndDate();
+                    cwProjectRecordsDTO.setPlanDate(planDate);
+                }
+            }
+            return cwProjectRecordsDTO;
+        }else {
+            CwProjectRecordsDTO cwProjectRecordsDTO1 = cwProjectRecordsMapper.queryById(queryNull);
+            if(null != cwProjectRecordsDTO1 && null != cwProjectRecordsDTO1.getCwProjectClientContactDTOList() && cwProjectRecordsDTO1.getCwProjectClientContactDTOList().size()>0){
+                for (CwProjectClientContactDTO clientContact : cwProjectRecordsDTO1.getCwProjectClientContactDTOList()) {
+                    //判断项目联系人是否是从客户联系人中选择出来的
+                    if(StringUtils.isNotBlank(clientContact.getClientContactId())){
+                        CwWorkClientContact clientContactInfo = cwWorkClientContactService.getInfoById(clientContact.getClientContactId());
+                        //若数据存在则将查询出来的数据信息进行替换
+                        if(null != clientContactInfo && StringUtils.isNotBlank(clientContactInfo.getId())){
+                            clientContact.setName(clientContactInfo.getName());
+                            clientContact.setSex(clientContactInfo.getSex());
+                            clientContact.setOfficeId(clientContactInfo.getOfficeId());
+                            clientContact.setPosition(clientContactInfo.getPosition());
+                            clientContact.setContactFirst(clientContactInfo.getContactFirst());
+                            clientContact.setContactSecond(clientContactInfo.getContactSecond());
+                            clientContact.setRemarks(clientContactInfo.getRemarks());
+                            clientContact.setFax(clientContactInfo.getFax());
+                            clientContact.setEmail(clientContactInfo.getEmail());
+                        }
+                    }
+                }
+            }
+            if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO1)) {
+                if (ObjectUtil.isNotEmpty(cwProjectRecordsDTO1.getPlanStartDate()) && ObjectUtil.isNotEmpty(cwProjectRecordsDTO1.getPlanEndDate())) {
+                    Date[] planDate = new Date[2];
+                    planDate[0] = cwProjectRecordsDTO1.getPlanStartDate();
+                    planDate[1] = cwProjectRecordsDTO1.getPlanEndDate();
+                    cwProjectRecordsDTO1.setPlanDate(planDate);
+                }
             }
+            return cwProjectRecordsDTO1;
         }
-        return cwProjectRecordsDTO;
     }
 
     /**

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectRecords/service/dto/CwProjectRecordsDTO.java

@@ -1,6 +1,7 @@
 package com.jeeplus.test.cw.projectRecords.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
+import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jeeplus.core.query.Query;
@@ -230,4 +231,5 @@ public class CwProjectRecordsDTO extends BaseDTO {
      */
     private String reportReview;
 
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/dto/CwManageLevelTypeDTO.java

@@ -6,6 +6,7 @@ import com.jeeplus.core.service.dto.BaseDTO;
 import com.jeeplus.test.cw.workClientInfo.domain.CwManageLevelType;
 import lombok.Data;
 
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -44,6 +45,10 @@ public class CwManageLevelTypeDTO extends BaseDTO {
      * 父ids
      */
     private String parentIds;
+    /**
+     * 是否显示按钮  0 代表不显示  1代表显示 */
+    @Size(min = 1, max = 1)
+    private String isShow;
 
     /**
      * 子集合