签章配置代码提交

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/invoice/service/FinanceInvoiceService.java

@@ -279,6 +279,9 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                 return new Page<FinanceInvoiceDTO>();
             }
         }
+        if (StringUtils.isNotBlank(financeInvoiceDTO.getName())){
+            queryWrapper.like("fi.name",financeInvoiceDTO.getName());
+        }
 
         IPage<FinanceInvoiceDTO> pageList = financeInvoiceMapper.findList(page, queryWrapper);
         pageList.getRecords().stream().forEach(item ->{
@@ -294,6 +297,11 @@ public class FinanceInvoiceService extends ServiceImpl<FinanceInvoiceMapper, Fin
                     item.setAuditUserIdsInvalid(flowTaskService.getTaskAuditUsers(item.getTaskIdInvalid()));  // 获取数据审核人
                 }
             }
+
+            if(StringUtils.isNotBlank(item.getBillingType()) && "2".equals(item.getBillingType()) && StringUtils.isNotBlank(item.getName())){
+                item.setBillingWorkplaceReal(item.getName());
+            }
+
         });
         return pageList;
     }

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/utils/Global.java

@@ -31,7 +31,7 @@ public class Global {
 	/**
 	 * 属性文件加载对象
 	 */
-	private static PropertiesLoader loader = new PropertiesLoader("application-finance.yml");
+	private static PropertiesLoader loader = new PropertiesLoader("application-assess.yml");
 
 
 	/**
@@ -85,11 +85,11 @@ public class Global {
 			if (StringUtils.isNotBlank(property)) {
 				switch (property){
 					case "development":
-						PropertiesLoader devLoader = new PropertiesLoader("application-finance-development.yml");
+						PropertiesLoader devLoader = new PropertiesLoader("application-assess-development.yml");
 						value = devLoader.getProperty(key);
 						break;
 					case "production":
-						PropertiesLoader proLoader = new PropertiesLoader("application-finance-production.yml");
+						PropertiesLoader proLoader = new PropertiesLoader("application-assess-production.yml");
 						value = proLoader.getProperty(key);
 						break;
 				}

jeeplus-modules/jeeplus-assess/src/main/resources/application-finance-development.yml

@@ -1,7 +1,4 @@
-# 合同管理-客户信息
-yy_apicode: 35afe9ec3263424f9a18feb837177169
-yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseSearchByName
-yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
+
 
 # 公共密码
 publicPassword: jsxgpassword

jeeplus-modules/jeeplus-assess/src/main/resources/application-assess-production.yml

@@ -0,0 +1,58 @@
+
+#验证码发送相关参数
+rong_userid: 8a216da86715511501673e331c24171e
+rong_token: 3d7dc58c6a334ad6887317efbf847e41
+app_id: 8a216da86715511501673e331c741725
+template_id: 435329
+code_type: 1
+
+
+# 合同管理-客户信息
+yy_apicode: 35afe9ec3263424f9a18feb837177169
+yy_mhcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseSearchByName
+yy_shcxurl: https://api.yonyoucloud.com/apis/dst/enterpriseTicketQuery/enterpriseTicketInfo
+
+# 公共密码
+publicPassword: jsxgpassword
+
+#阿里云文件夹路径
+aliyun_directory: attachment-file/assess
+#签章阿里云文件bucketName
+qzBucketName: xg-qz
+#文件存储位置
+directory: /attachment-file
+
+aliyunUrl: http://oss.gangwaninfo.com
+
+
+apptoken: Mt4een4BN8
+appsecret: qhA4aV2GKE8Oq8k4G3twLiUn4U60cN
+signature: 19ed90930b5b84800ea582e34b71d1dd
+
+signature_http_top: http://121.40.158.10:9182
+
+#竖版模板templateId
+vertical_templateId: 2896237810850173018
+#横板模板templateId
+across_templateId: 2896237585095954500
+#公司圆章(评估)
+company_round_seal_id: 3169845144496476527
+#公司圆章-竖
+company_round_seal_id_vertical: 2898042707446829376
+#公司方章
+company_parties_seal_id: 2895597212998434929
+#审定单用印流程id
+approval_category_id: 3040555949196452300
+#报告用印流程id
+report_category_id: 2896237012158222343
+#审定内用印流程id
+judgement_category_id: 2912238663717396786
+#审定单用印流程id(盐城)
+approval_YC_category_id: 2933219658963918882
+#报告用印流程id(盐城)
+report_YC_category_id: 2933233335469383748
+#评估-日常办公流程id
+signature_daily_office_work: 3206161416121062057
+#评估-报告签章流程id
+signature_report_caregory_id: 3206161481749336766
+

jeeplus-modules/jeeplus-assess/src/main/resources/application-assess.yml

@@ -0,0 +1,2 @@
+#active: development
+active: production

jeeplus-modules/jeeplus-assess/src/main/resources/application-finance.yml

@@ -1,2 +0,0 @@
-active: development
-#active: production

jeeplus-modules/jeeplus-ccpm/src/main/java/com/jeeplus/ccpm/approvalInfo/controller/CcpmReimbursementInfoController.java

@@ -229,12 +229,17 @@ public class CcpmReimbursementInfoController {
     @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-centrecareful/src/main/java/com/jeeplus/centrecareful/approvalInfo/controller/ZsReimbursementInfoController.java

@@ -227,12 +227,17 @@ public class ZsReimbursementInfoController {
     @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-consult/src/main/java/com/jeeplus/consultancy/approvalInfo/controller/ConsultancyReimbursementInfoController.java

@@ -229,12 +229,17 @@ public class ConsultancyReimbursementInfoController {
     @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-finance/src/main/resources/application-finance-production.yml

@@ -51,4 +51,10 @@ judgement_category_id: 2912238663717396786
 approval_YC_category_id: 2933219658963918882
 #报告用印流程id(盐城)
 report_YC_category_id: 2933233335469383748
+#会计公司圆章
+company_round_seal_finance_id: 3048906729846612268
+#会计-日常办公流程id
+signature_daily_office_work: 3206161566436528851
+#会计-报告签章流程id
+signature_report_caregory_id: 3206161611193946856