Merge remote-tracking branch 'origin/master'

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/controller/ReimbursementInfoController.java

@@ -200,12 +200,17 @@ public class ReimbursementInfoController {
     @ApiOperation(value = "根据发票号查询是否已经或正在报销")
     public Map<String,Object> getEffectiveDataByInvoiceNumber(String invoiceNumber,String id){
         Map map = new HashMap();
-        Integer count = service.getEffectiveDataByInvoiceNumber(invoiceNumber,id);
-        if(count>0){
+        if(org.apache.commons.lang3.StringUtils.isBlank(invoiceNumber)){
             map.put("success",false);
-            map.put("message","发票号：" + invoiceNumber + " 已发起或完成报销，请勿重复报销");
+            map.put("message","发票号不可为空");
         }else{
-            map.put("success",true);
+            Integer count = service.getEffectiveDataByInvoiceNumber(invoiceNumber,id);
+            if(count>0){
+                map.put("success",false);
+                map.put("message","发票号：" + invoiceNumber + " 已发起或完成报销，请勿重复报销");
+            }else{
+                map.put("success",true);
+            }
         }
         return map;
     }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/domain/ReimbursementInfo.java

@@ -67,4 +67,8 @@ public class ReimbursementInfo extends BaseEntity {
     private String purchaseId;
 
     private String reimbursementType; // 报销类型（0：普通报销；1：电子发票报销）
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/mapper/xml/ReimbursementInfoMapper.xml

@@ -55,7 +55,8 @@
 			a.create_by_id as create_id,
 			a.source_type,
 			a.purchase_id,
-			a.reimbursement_type
+			a.reimbursement_type,
+			a.approval_time
 -- 			pru.purchase_no
 		FROM
 			reimbursement_info a

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -109,7 +109,7 @@ public class ReimbursementInfoService {
         }
         // 报销时间
         if (dto.getDates() != null && dto.getDates().length > 0) {
-            queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
+            queryWrapper.between("a.approval_time", dto.getDates()[0], dto.getDates()[1]);
         }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {
@@ -288,6 +288,9 @@ public class ReimbursementInfoService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         info.setDelFlag(0);
+        if ("2".equals(dto.getType())){
+            info.setApprovalTime(new Date());
+        }
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
@@ -406,6 +409,16 @@ public class ReimbursementInfoService {
         BeanUtils.copyProperties(dto, info);
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
+
+        //根据id查询申请日期是否存在
+        ReimbursementInfo reimbursementInfo = infoMapper.selectById(dto.getId());
+        if ("2".equals(dto.getType())){
+            if (ObjectUtil.isEmpty(reimbursementInfo.getApprovalTime())){
+                info.setApprovalTime(new Date());
+            }
+        }
+        infoMapper.updateById(info);
+
         infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/dto/RetureListDto.java

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import org.apache.poi.hpsf.Decimal;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -125,4 +126,8 @@ public class RetureListDto {
      * 数据审核人  报销
      */
     private List<String> auditUserIds;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/domain/CcpmReimbursementInfo.java

@@ -76,4 +76,9 @@ public class CcpmReimbursementInfo extends BaseEntity {
      */
     private String reimbursementType;
 
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
+
 }

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/mapper/xml/CcpmReimbursementInfoMapper.xml

@@ -121,7 +121,8 @@
 			a.purchase_id,
 			a.reimbursement_type,
 			pru.purchase_no,
-                         a.update_time
+                         a.update_time,
+                         a.approval_time
 		FROM
 			ccpm_reimbursement_info a
 			LEFT JOIN ccpm_reimbursement_detail_info b ON a.id = b.info_id

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/CcpmReimbursementInfoService.java

@@ -261,6 +261,9 @@ public class CcpmReimbursementInfoService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         info.setDelFlag(0);
+        if ("2".equals(dto.getType())){
+            info.setApprovalTime(new Date());
+        }
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
@@ -372,6 +375,13 @@ public class CcpmReimbursementInfoService {
         BeanUtils.copyProperties(dto, info);
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
+        //根据id查询申请日期是否存在
+        CcpmReimbursementInfo ccpmReimbursementInfo = infoMapper.selectById(dto.getId());
+        if ("2".equals(dto.getType())){
+            if (ObjectUtil.isEmpty(ccpmReimbursementInfo.getApprovalTime())){
+                info.setApprovalTime(new Date());
+            }
+        }
         infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
@@ -669,7 +679,7 @@ public class CcpmReimbursementInfoService {
         }
         // 报销时间
         if (dto.getDates() != null) {
-            queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
+            queryWrapper.between("a.approval_time", dto.getDates()[0], dto.getDates()[1]);
         }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/service/dto/CcpmRetureListDto.java

@@ -3,6 +3,7 @@ package com.jeeplus.ccpm.approvalInfo.service.dto;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -126,4 +127,8 @@ public class CcpmRetureListDto {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/domain/ZsReimbursementInfo.java

@@ -76,4 +76,9 @@ public class ZsReimbursementInfo extends BaseEntity {
      */
     private String reimbursementType;
 
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
+
 }

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/mapper/xml/ZsReimbursementInfoMapper.xml

@@ -121,7 +121,8 @@
 			a.purchase_id,
 			a.reimbursement_type,
 			pru.purchase_no,
-                         a.update_time
+                         a.update_time,
+                         a.approval_time
 		FROM
 			zs_reimbursement_info a
 			LEFT JOIN zs_reimbursement_detail_info b ON a.id = b.info_id

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/ZsReimbursementInfoService.java

@@ -258,6 +258,9 @@ public class ZsReimbursementInfoService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         info.setDelFlag(0);
+        if ("2".equals(dto.getType())){
+            info.setApprovalTime(new Date());
+        }
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
@@ -369,6 +372,13 @@ public class ZsReimbursementInfoService {
         BeanUtils.copyProperties(dto, info);
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
+        //根据id查询申请日期是否存在
+        ZsReimbursementInfo zsReimbursementInfo = infoMapper.selectById(dto.getId());
+        if ("2".equals(dto.getType())){
+            if (ObjectUtil.isEmpty(zsReimbursementInfo.getApprovalTime())){
+                info.setApprovalTime(new Date());
+            }
+        }
         infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
@@ -666,7 +676,7 @@ public class ZsReimbursementInfoService {
         }
         // 报销时间
         if (dto.getDates() != null) {
-            queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
+            queryWrapper.between("a.approval_time", dto.getDates()[0], dto.getDates()[1]);
         }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/service/dto/ZsRetureListDto.java

@@ -2,7 +2,9 @@ package com.jeeplus.centrecareful.approvalInfo.service.dto;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jeeplus.centrecareful.approvalInfo.domain.ZsReimbursementInfo;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -126,4 +128,8 @@ public class ZsRetureListDto {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/domain/ConsultancyReimbursementInfo.java

@@ -75,5 +75,9 @@ public class ConsultancyReimbursementInfo extends BaseEntity {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 
 }

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/mapper/xml/ConsultancyReimbursementInfoMapper.xml

@@ -121,7 +121,8 @@
 			a.purchase_id,
 			a.reimbursement_type,
 			pru.purchase_no,
-                         a.update_time
+                         a.update_time,
+                         a.approval_time
 		FROM
 			consultancy_reimbursement_info a
 			LEFT JOIN consultancy_reimbursement_detail_info b ON a.id = b.info_id

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/ConsultancyReimbursementInfoService.java

@@ -261,6 +261,9 @@ public class ConsultancyReimbursementInfoService {
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
         info.setDelFlag(0);
+        if ("2".equals(dto.getType())){
+            info.setApprovalTime(new Date());
+        }
         infoMapper.insert(info);
         // 保存项目详情列表信息
         if (CollectionUtils.isNotEmpty(dto.getDetailInfos())) {
@@ -372,6 +375,13 @@ public class ConsultancyReimbursementInfoService {
         BeanUtils.copyProperties(dto, info);
         info.setUpdateById(userDTO.getId());
         info.setUpdateTime(new Date());
+        //根据id查询申请日期是否存在
+        ConsultancyReimbursementInfo consultancyReimbursementInfo = infoMapper.selectById(dto.getId());
+        if ("2".equals(dto.getType())){
+            if (ObjectUtil.isEmpty(consultancyReimbursementInfo.getApprovalTime())){
+                info.setApprovalTime(new Date());
+            }
+        }
         infoMapper.updateById(info);
         // 修改报销详情列表信息
         // 删除原有数据
@@ -669,7 +679,7 @@ public class ConsultancyReimbursementInfoService {
         }
         // 报销时间
         if (dto.getDates() != null) {
-            queryWrapper.between("a.reim_date", dto.getDates()[0], dto.getDates()[1]);
+            queryWrapper.between("a.approval_time", dto.getDates()[0], dto.getDates()[1]);
         }
         // 经办人
         if (StringUtils.isNotEmpty(dto.getHandled())) {

jeeplus-modules/jeeplus-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/service/dto/ConsultancyRetureListDto.java

@@ -3,6 +3,7 @@ package com.jeeplus.consultancy.approvalInfo.service.dto;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -126,4 +127,8 @@ public class ConsultancyRetureListDto {
      * 报销类型（0：普通报销；1：电子发票报销）
      */
     private String reimbursementType;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/controller/CwReimbursementInfoController.java

@@ -236,12 +236,17 @@ public class CwReimbursementInfoController {
     @ApiOperation(value = "根据发票号查询是否已经或正在报销")
     public Map<String,Object> getEffectiveDataByInvoiceNumber(String invoiceNumber,String id){
         Map map = new HashMap();
-        Integer count = service.getEffectiveDataByInvoiceNumber(invoiceNumber,id);
-        if(count>0){
+        if(StringUtils.isBlank(invoiceNumber)){
             map.put("success",false);
-            map.put("message","发票号：" + invoiceNumber + " 已发起或完成报销，请勿重复报销");
+            map.put("message","发票号不可为空");
         }else{
-            map.put("success",true);
+            Integer count = service.getEffectiveDataByInvoiceNumber(invoiceNumber,id);
+            if(count>0){
+                map.put("success",false);
+                map.put("message","发票号：" + invoiceNumber + " 已发起或完成报销，请勿重复报销");
+            }else{
+                map.put("success",true);
+            }
         }
         return map;
     }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/domain/CwReimbursementInfo.java

@@ -74,5 +74,8 @@ public class CwReimbursementInfo extends BaseEntity {
      * 报销类型
      */
     private String reimbursementType;
-
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/mapper/xml/CwReimbursementInfoMapper.xml

@@ -70,6 +70,7 @@
 			a.reimbursement_type,
 			a.user_name,
 			a.reim_date,
+			a.approval_time,
 			a.type,
 			a.proc_ins_id,
 			a.process_definition_id,

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/reimbursementApproval/approvalInfo/service/dto/RetureListDto.java

@@ -3,6 +3,7 @@ package com.jeeplus.finance.reimbursementApproval.approvalInfo.service.dto;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -136,4 +137,8 @@ public class RetureListDto {
      */
     private String reportUser;
     private String reportOffice;
+    //送审日期
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private Date approvalTime;
 }