From a54e249f9fedf3633825dd7a6846621df7b110b9 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 18 十月 2023 12:00:55 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 32 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/OnlyValueCommon.java | 72 +++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyVO.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java | 43 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 424 +++++++++++++++--------------
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java | 8
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java | 2
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java | 6
ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml | 118 ++++----
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 26
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java | 22
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 43 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java | 4
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 4
ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml | 2
ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml | 2
20 files changed, 485 insertions(+), 352 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/OnlyValueCommon.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/OnlyValueCommon.java
new file mode 100644
index 0000000..1877da5
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/OnlyValueCommon.java
@@ -0,0 +1,72 @@
+package com.ruoyi.web.controller.common;
+
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.BaseOnlyvalue;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Calendar;
+import java.util.List;
+
+@Component
+public class OnlyValueCommon {
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
+
+ public String addOnlyValue(String businessType) {
+ String currentValue = null;
+ switch (businessType) {
+ case "zj":
+ //涓撳
+ currentValue = saveOrUpdateOnlyVal("zj", null);
+ break;
+
+ case "donationwitness":
+ //鎹愮尞
+ currentValue = saveOrUpdateOnlyVal("donationwitness", String.valueOf(Calendar.getInstance().get(Calendar.YEAR)));
+ break;
+
+ case "organization":
+ //鏈烘瀯
+ currentValue = saveOrUpdateOnlyVal(" organization", null);
+ break;
+
+ default:
+ break;
+ }
+
+ return currentValue;
+ }
+
+
+ private String saveOrUpdateOnlyVal(String businesstype, String year) {
+ String currentValue = null;
+ //鍒ゆ柇璇ュ勾浠界殑鏁版嵁鏄惁瀛樺湪
+ BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
+ //鎹愮尞銆傞渶瑕佸甫骞翠唤鏌ヨ
+ if (!StringUtils.isEmpty(year)) {
+ baseOnlyvalue.setAppentvalue(year);
+ }
+ baseOnlyvalue.setBusinesstype(businesstype);
+ List<BaseOnlyvalue> baseOnlyvalues = baseOnlyvalueService.queryList(baseOnlyvalue);
+ if (!CollectionUtils.isEmpty(baseOnlyvalues)) {
+ //璇存槑宸茬粡瀛樺湪锛屽垯缁檆urrentValue鍔�1鍗冲彲
+ BaseOnlyvalue baseOnlyvalue1 = baseOnlyvalues.get(0);
+ baseOnlyvalue1.setCurrentvalue(baseOnlyvalue1.getCurrentvalue() + 1);
+ currentValue = String.valueOf(baseOnlyvalue1.getCurrentvalue() + 1);
+ baseOnlyvalueService.updateById(baseOnlyvalue1);
+ } else {
+ //涓嶅瓨鍦紝鍒欓渶瑕佸垱寤�
+ baseOnlyvalue.setCurrentvalue(1L);
+ baseOnlyvalue.setBusinesstype(businesstype);
+ baseOnlyvalue.setAppentvalue(year);
+ baseOnlyvalueService.save(baseOnlyvalue);
+ currentValue = "1";
+ }
+ return currentValue;
+
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index ae18ad6..94f1f26 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,17 +21,19 @@
/**
* 鏈烘瀯绠＄悊Controller
- *
+ *
* @author ruoyi
* @date 2021-11-05
*/
@Api("鏈烘瀯淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/organization")
-public class BaseOrganizationController extends BaseController
-{
+public class BaseOrganizationController extends BaseController {
@Autowired
private IBaseOrganizationService baseOrganizationService;
+
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
/**
* 鏌ヨ鏈烘瀯绠＄悊鍒楄〃
@@ -38,8 +41,7 @@
@ApiOperation("鑾峰彇鏈烘瀯鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
- public TableDataInfo list(BaseOrganization baseOrganization)
- {
+ public TableDataInfo list(BaseOrganization baseOrganization) {
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -52,8 +54,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:export')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseOrganization baseOrganization)
- {
+ public AjaxResult export(BaseOrganization baseOrganization) {
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -65,8 +66,7 @@
@ApiOperation("閫氳繃鏈烘瀯id鑾峰彇鏈烘瀯淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -78,8 +78,10 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseOrganization baseOrganization)
- {
+ public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
+ String organization = onlyValueCommon.addOnlyValue("organization");
+ //"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
+ baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
return toAjax(baseOrganizationService.save(baseOrganization));
}
@@ -90,9 +92,8 @@
//@PreAuthorize("@ss.hasPermi('project:organization:edit')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseOrganization baseOrganization)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -103,8 +104,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:remove')")
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
index d1a0571..a9d8a31 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -6,12 +6,18 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.mapper.BaseOnlyvalueMapper;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.impl.BaseOnlyvalueServiceImpl;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
@@ -19,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -39,17 +46,19 @@
/**
* 鎹愮尞瑙佽瘉Controller
- *
+ *
* @author ruoyi
* @date 2021-11-17
*/
@Api("鎹愮尞瑙佽瘉绠＄悊")
@RestController
@RequestMapping("/project/donationwitness")
-public class ServiceDonationwitnessController extends BaseController
-{
+public class ServiceDonationwitnessController extends BaseController {
@Autowired
private IServiceDonationwitnessService serviceDonationwitnessService;
+
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
@Autowired
private IServiceDonateorganService serviceDonateorganService;
@@ -57,6 +66,8 @@
@Autowired
private IServiceDonatebaseinfoService serviceDonatebaseinfoService;
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
private static Configuration configuration = null;
@@ -72,8 +83,7 @@
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonationwitness serviceDonationwitness)
- {
+ public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
startPage();
List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
return getDataTable(list);
@@ -81,8 +91,7 @@
@ApiOperation("鑾峰彇鎹愮尞瑙佽瘉鍒楄〃-鏂�")
@GetMapping("/listnew")
- public TableDataInfo listnew(DonationWitnessVO donationWitnessVO)
- {
+ public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
startPage();
List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
return getDataTable(list);
@@ -96,8 +105,7 @@
//@PreAuthorize("@ss.hasPermi('project:donationwitness:export')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonationwitness serviceDonationwitness)
- {
+ public AjaxResult export(ServiceDonationwitness serviceDonationwitness) {
List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
ExcelUtil<ServiceDonationwitness> util = new ExcelUtil<ServiceDonationwitness>(ServiceDonationwitness.class);
return util.exportExcel(list, "鎹愮尞瑙佽瘉鏁版嵁");
@@ -109,8 +117,7 @@
@ApiOperation("閫氳繃id鑾峰彇瑙佽瘉淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonationwitnessService.getById(id));
}
@@ -122,8 +129,8 @@
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness)
- {
+ public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
+
return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
}
@@ -134,9 +141,17 @@
//@PreAuthorize("@ss.hasPermi('project:donationwitness:edit')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
+ int last = -1;
+ if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
+ last = serviceDonationwitness.getDonorno().lastIndexOf("*");
+ }
+ //鎹愮尞鑰呯紪鍙锋渶鍚庝竴浣嶆槸 * ,鎵嶅彲浠ュ線鍞竴閲岃〃鍔犳暟鎹�
+ if (last == serviceDonationwitness.getDonorno().length()) {
+ onlyValueCommon.addOnlyValue("donationwitness");
+ }
+
return toAjax(serviceDonationwitnessService.updateById(serviceDonationwitness));
}
@@ -147,15 +162,13 @@
//@PreAuthorize("@ss.hasPermi('project:donationwitness:remove')")
@Log(title = "鎹愮尞瑙佽瘉", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonationwitnessService.removeByIds(Arrays.asList(ids)));
}
@GetMapping(value = "/getByInfoId/{infoid}")
- public AjaxResult getByInfoId(@PathVariable("infoid") Long infoid)
- {
+ public AjaxResult getByInfoId(@PathVariable("infoid") Long infoid) {
return AjaxResult.success(serviceDonationwitnessService.getByInfoId(infoid));
}
@@ -171,7 +184,7 @@
System.out.println(filePath);
//璁剧疆妯℃湰瑁呯疆鏂规硶鍜岃矾寰�,FreeMarker鏀寔澶氱妯℃澘瑁呰浇鏂规硶銆傚彲浠ラ噸servlet锛宑lasspath锛屾暟鎹簱鏁欑▼瑁呰浇锛�
configuration.setDirectoryForTemplateLoading(new File(filePath));
- Template t=null;
+ Template t = null;
try {
//鎹愮尞琛�.ftl涓鸿瑁呰浇鐨勬ā鏉�
t = configuration.getTemplate("浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�.ftl");
@@ -179,13 +192,13 @@
e.printStackTrace();
}
String newTime = String.valueOf(Calendar.getInstance().getTimeInMillis());
- String name = "浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛╛"+dataMap.get("XM")+"_"+ newTime;
+ String name = "浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛╛" + dataMap.get("XM") + "_" + newTime;
//杈撳嚭鏂囨。璺緞鍙婂悕绉�
- File outFile = new File(RuoYiConfig.getProfile()+"/download/wordtemplate/"+name+".doc");
+ File outFile = new File(RuoYiConfig.getProfile() + "/download/wordtemplate/" + name + ".doc");
Writer out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile),"utf-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
} catch (FileNotFoundException e1) {
e1.printStackTrace();
@@ -195,123 +208,125 @@
} catch (TemplateException e) {
e.printStackTrace();
}
- Map<String ,Object> map = new HashMap<>();
- map.put("downloadUrl","/profile/download/wordtemplate/"+name+".doc");
+ Map<String, Object> map = new HashMap<>();
+ map.put("downloadUrl", "/profile/download/wordtemplate/" + name + ".doc");
return map;
}
+
/**
* 娉ㄦ剰dataMap閲屽瓨鏀剧殑鏁版嵁Key鍊艰涓庢ā鏉夸腑鐨勫弬鏁扮浉瀵瑰簲
+ *
* @param dataMap
*/
- private void getData(Map dataMap, Long id){
+ private void getData(Map dataMap, Long id) {
DonationWitnessVO donationWitnessVO = new DonationWitnessVO();
List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
DonationWitnessVO donationWitness = new DonationWitnessVO();
- for(DonationWitnessVO v : list){
- if(v.getDwid() != null && v.getDwid().longValue() == id){
+ for (DonationWitnessVO v : list) {
+ if (v.getDwid() != null && v.getDwid().longValue() == id) {
donationWitness = v;
}
}
SimpleDateFormat sformat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- dataMap.put("JXBH",donationWitness.getDonorno());
- dataMap.put("XM",donationWitness.getName());
- dataMap.put("JXYY",donationWitness.getTreatmenthospitalname() == null ? "" : donationWitness.getTreatmenthospitalname());
- dataMap.put("SWPD1",donationWitness.getDeathjudgedocto() == null ? "" : donationWitness.getDeathjudgedocto());
- dataMap.put("SWPD2",donationWitness.getDeathjudgedoctt() == null ? "" : donationWitness.getDeathjudgedoctt());
- dataMap.put("SWYY",donationWitness.getDeathreason() == null ? "" : donationWitness.getDeathreason());
- dataMap.put("SWSJ",donationWitness.getDeathtime() == null ? "": sformat.format(donationWitness.getDeathtime()));
- if(donationWitness.getDwdonationcategory().contains("DBD")){
- dataMap.put("ZGYL",(char) 8730);
- }else{
- dataMap.put("ZGYL","鈻�");
+ dataMap.put("JXBH", donationWitness.getDonorno());
+ dataMap.put("XM", donationWitness.getName());
+ dataMap.put("JXYY", donationWitness.getTreatmenthospitalname() == null ? "" : donationWitness.getTreatmenthospitalname());
+ dataMap.put("SWPD1", donationWitness.getDeathjudgedocto() == null ? "" : donationWitness.getDeathjudgedocto());
+ dataMap.put("SWPD2", donationWitness.getDeathjudgedoctt() == null ? "" : donationWitness.getDeathjudgedoctt());
+ dataMap.put("SWYY", donationWitness.getDeathreason() == null ? "" : donationWitness.getDeathreason());
+ dataMap.put("SWSJ", donationWitness.getDeathtime() == null ? "" : sformat.format(donationWitness.getDeathtime()));
+ if (donationWitness.getDwdonationcategory().contains("DBD")) {
+ dataMap.put("ZGYL", (char) 8730);
+ } else {
+ dataMap.put("ZGYL", "鈻�");
}
- if(donationWitness.getDwdonationcategory().contains("DCD")){
- dataMap.put("ZGEL",(char) 8730);
- }else{
- dataMap.put("ZGEL","鈻�");
+ if (donationWitness.getDwdonationcategory().contains("DCD")) {
+ dataMap.put("ZGEL", (char) 8730);
+ } else {
+ dataMap.put("ZGEL", "鈻�");
}
- if(donationWitness.getDwdonationcategory().contains("DBCD")){
- dataMap.put("ZGSL",(char) 8730);
- }else{
- dataMap.put("ZGSL","鈻�");
+ if (donationWitness.getDwdonationcategory().contains("DBCD")) {
+ dataMap.put("ZGSL", (char) 8730);
+ } else {
+ dataMap.put("ZGSL", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C22")){
- dataMap.put("GZ",(char) 8730);
- }else{
- dataMap.put("GZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C22")) {
+ dataMap.put("GZ", (char) 8730);
+ } else {
+ dataMap.put("GZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C64L")){
- dataMap.put("ZS",(char) 8730);
- }else{
- dataMap.put("ZS","鈻�");
+ if (donationWitness.getOrgandonation().contains("C64L")) {
+ dataMap.put("ZS", (char) 8730);
+ } else {
+ dataMap.put("ZS", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C64R")){
- dataMap.put("YS",(char) 8730);
- }else{
- dataMap.put("YS","鈻�");
+ if (donationWitness.getOrgandonation().contains("C64R")) {
+ dataMap.put("YS", (char) 8730);
+ } else {
+ dataMap.put("YS", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C38")){
- dataMap.put("XZ",(char) 8730);
- }else{
- dataMap.put("XZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C38")) {
+ dataMap.put("XZ", (char) 8730);
+ } else {
+ dataMap.put("XZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C34")){
- dataMap.put("FZ",(char) 8730);
- }else{
- dataMap.put("FZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C34")) {
+ dataMap.put("FZ", (char) 8730);
+ } else {
+ dataMap.put("FZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C25")){
- dataMap.put("YX",(char) 8730);
- }else{
- dataMap.put("YX","鈻�");
+ if (donationWitness.getOrgandonation().contains("C25")) {
+ dataMap.put("YX", (char) 8730);
+ } else {
+ dataMap.put("YX", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C17")){
- dataMap.put("XC",(char) 8730);
- }else{
- dataMap.put("XC","鈻�");
+ if (donationWitness.getOrgandonation().contains("C17")) {
+ dataMap.put("XC", (char) 8730);
+ } else {
+ dataMap.put("XC", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C69L")){
- dataMap.put("ZYZZ",(char) 8730);
- }else{
- dataMap.put("ZYZZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C69L")) {
+ dataMap.put("ZYZZ", (char) 8730);
+ } else {
+ dataMap.put("ZYZZ", "鈻�");
}
- if(donationWitness.getOrgandonation().contains("C69R")){
- dataMap.put("YYZZ",(char) 8730);
- }else{
- dataMap.put("YYZZ","鈻�");
+ if (donationWitness.getOrgandonation().contains("C69R")) {
+ dataMap.put("YYZZ", (char) 8730);
+ } else {
+ dataMap.put("YYZZ", "鈻�");
}
String hqzz = serviceDonatebaseinfoService.gethqzz(donationWitness.getInfoid());
dataMap.put("HQZZ", hqzz == null ? "" : hqzz);
- dataMap.put("KSSJ",donationWitness.getOperationbegtime() == null ? "" : sformat.format(donationWitness.getOperationbegtime()));
- dataMap.put("JSSJ",donationWitness.getOperationendtime() == null ? "" : sformat.format(donationWitness.getOperationendtime()));
+ dataMap.put("KSSJ", donationWitness.getOperationbegtime() == null ? "" : sformat.format(donationWitness.getOperationbegtime()));
+ dataMap.put("JSSJ", donationWitness.getOperationendtime() == null ? "" : sformat.format(donationWitness.getOperationendtime()));
- dataMap.put("FZDMCG",donationWitness.getAbdominalaortacannulatime() == null ? "" : sformat.format(donationWitness.getAbdominalaortacannulatime()));
- dataMap.put("FZDMGZ",donationWitness.getAbdominalaortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAbdominalaortaperfusiontime()));
- dataMap.put("MJMCG",donationWitness.getPortalveincannulatime() == null ? "" : sformat.format(donationWitness.getPortalveincannulatime()));
- dataMap.put("MJMGZ",donationWitness.getPortalveinperfusiontime() == null ? "" : sformat.format(donationWitness.getPortalveinperfusiontime()));
- dataMap.put("FDMCG",donationWitness.getPulmonaryarterycannulatime() == null ? "" : sformat.format(donationWitness.getPulmonaryarterycannulatime()));
- dataMap.put("FDMGZ",donationWitness.getPulmonaryarteryperfusiontime() == null ? "" : sformat.format(donationWitness.getPulmonaryarteryperfusiontime()));
- dataMap.put("ZDMCG",donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
- dataMap.put("ZDMGZ",donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));
+ dataMap.put("FZDMCG", donationWitness.getAbdominalaortacannulatime() == null ? "" : sformat.format(donationWitness.getAbdominalaortacannulatime()));
+ dataMap.put("FZDMGZ", donationWitness.getAbdominalaortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAbdominalaortaperfusiontime()));
+ dataMap.put("MJMCG", donationWitness.getPortalveincannulatime() == null ? "" : sformat.format(donationWitness.getPortalveincannulatime()));
+ dataMap.put("MJMGZ", donationWitness.getPortalveinperfusiontime() == null ? "" : sformat.format(donationWitness.getPortalveinperfusiontime()));
+ dataMap.put("FDMCG", donationWitness.getPulmonaryarterycannulatime() == null ? "" : sformat.format(donationWitness.getPulmonaryarterycannulatime()));
+ dataMap.put("FDMGZ", donationWitness.getPulmonaryarteryperfusiontime() == null ? "" : sformat.format(donationWitness.getPulmonaryarteryperfusiontime()));
+ dataMap.put("ZDMCG", donationWitness.getAortacannulatime() == null ? "" : sformat.format(donationWitness.getAortacannulatime()));
+ dataMap.put("ZDMGZ", donationWitness.getAortaperfusiontime() == null ? "" : sformat.format(donationWitness.getAortaperfusiontime()));
- if(donationWitness.getIsrestoreremains() == 0){
- dataMap.put("HFYT","鈻�");
- dataMap.put("BHFYT",(char) 8730);
- }else if(donationWitness.getIsrestoreremains() == 1){
- dataMap.put("HFYT",(char) 8730);
- dataMap.put("BHFYT","鈻�");
+ if (donationWitness.getIsrestoreremains() == 0) {
+ dataMap.put("HFYT", "鈻�");
+ dataMap.put("BHFYT", (char) 8730);
+ } else if (donationWitness.getIsrestoreremains() == 1) {
+ dataMap.put("HFYT", (char) 8730);
+ dataMap.put("BHFYT", "鈻�");
}
- if(donationWitness.getIsspendremember() == 0){
- dataMap.put("MA","鈻�");
- dataMap.put("BMA",(char) 8730);
- }else if(donationWitness.getIsspendremember() == 1){
- dataMap.put("MA",(char) 8730);
- dataMap.put("BMA","鈻�");
+ if (donationWitness.getIsspendremember() == 0) {
+ dataMap.put("MA", "鈻�");
+ dataMap.put("BMA", (char) 8730);
+ } else if (donationWitness.getIsspendremember() == 1) {
+ dataMap.put("MA", (char) 8730);
+ dataMap.put("BMA", "鈻�");
}
ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
@@ -322,8 +337,8 @@
Boolean qg = false;
Boolean zg = false;
Boolean yg = false;
- Boolean zs = false;
- Boolean ys = false;
+ Boolean zs = false;
+ Boolean ys = false;
Boolean qf = false;
Boolean zf = false;
Boolean yf = false;
@@ -332,165 +347,165 @@
Boolean zyjm = false;
Boolean yyjm = false;
- if(donateorganList.size() > 0){
- for(int i = 0; i<donateorganList.size(); i++){
- if(donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())){
- dataMap.put("XZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("XZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ if (donateorganList.size() > 0) {
+ for (int i = 0; i < donateorganList.size(); i++) {
+ if (donateorganList.get(i).getOrganno().equals(OrganEnum.XZ.getCode())) {
+ dataMap.put("XZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("XZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("XZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
xz = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())){
- dataMap.put("GZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("QGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QG.getCode())) {
+ dataMap.put("GZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("QGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("GZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
qg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())){
- dataMap.put("ZGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZG.getCode())) {
+ dataMap.put("ZGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZGZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())){
- dataMap.put("YGZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YGZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YG.getCode())) {
+ dataMap.put("YGZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YGZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YGZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yg = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())){
- dataMap.put("ZSZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZSZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZS.getCode())) {
+ dataMap.put("ZSZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZSZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZSZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zs = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())){
- dataMap.put("YSZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YSZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YS.getCode())) {
+ dataMap.put("YSZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YSZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YSZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
ys = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())){
- dataMap.put("QYFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("QYFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.QF.getCode())) {
+ dataMap.put("QYFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("QYFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("QYFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
qf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())){
- dataMap.put("ZFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZF.getCode())) {
+ dataMap.put("ZFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
- dataMap.put("ZFZRQ",donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
+ dataMap.put("ZFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())){
- dataMap.put("YFZYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YFZFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YF.getCode())) {
+ dataMap.put("YFZYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YFZFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YFZRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yf = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())){
- dataMap.put("YXYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YXFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YX.getCode())) {
+ dataMap.put("YXYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YXFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("YXRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yx = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())){
- dataMap.put("XCYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("XCYY",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.XC.getCode())) {
+ dataMap.put("XCYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("XCYY", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("XCRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
xc = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())){
- dataMap.put("ZYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("ZYFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.ZYJM.getCode())) {
+ dataMap.put("ZYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("ZYFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
dataMap.put("ZYRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
zyjm = true;
- }else if(donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())){
- dataMap.put("YYYY",donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
- dataMap.put("YYFZR",donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
+ } else if (donateorganList.get(i).getOrganno().equals(OrganEnum.YYJM.getCode())) {
+ dataMap.put("YYYY", donateorganList.get(i).getTransplanthospitalname() == null ? "" : donateorganList.get(i).getTransplanthospitalname());
+ dataMap.put("YYFZR", donateorganList.get(i).getOrgangetdoct() == null ? "" : donateorganList.get(i).getOrgangetdoct());
- dataMap.put("YYRQ",donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
+ dataMap.put("YYRQ", donateorganList.get(i).getOrgangettime() == null ? "" : sformat.format(donateorganList.get(i).getOrgangettime()));
yyjm = true;
}
}
- if(xz.booleanValue() == false){
- dataMap.put("XZYY","");
- dataMap.put("XZFZR","");
- dataMap.put("XZRQ","");
+ if (xz.booleanValue() == false) {
+ dataMap.put("XZYY", "");
+ dataMap.put("XZFZR", "");
+ dataMap.put("XZRQ", "");
}
- if(qg.booleanValue() == false){
- dataMap.put("GZYY","");
- dataMap.put("QGZFZR","");
- dataMap.put("GZRQ","");
+ if (qg.booleanValue() == false) {
+ dataMap.put("GZYY", "");
+ dataMap.put("QGZFZR", "");
+ dataMap.put("GZRQ", "");
}
- if(zg.booleanValue() == false){
- dataMap.put("ZGZYY","");
- dataMap.put("ZGZFZR","");
- dataMap.put("ZGZRQ","");
+ if (zg.booleanValue() == false) {
+ dataMap.put("ZGZYY", "");
+ dataMap.put("ZGZFZR", "");
+ dataMap.put("ZGZRQ", "");
}
- if(yg.booleanValue() == false){
- dataMap.put("YGZYY","");
- dataMap.put("YGZFZR","");
- dataMap.put("YGZRQ","");
+ if (yg.booleanValue() == false) {
+ dataMap.put("YGZYY", "");
+ dataMap.put("YGZFZR", "");
+ dataMap.put("YGZRQ", "");
}
- if(zs.booleanValue() == false){
- dataMap.put("ZSZYY","");
- dataMap.put("ZSZFZR","");
- dataMap.put("ZSZRQ","");
+ if (zs.booleanValue() == false) {
+ dataMap.put("ZSZYY", "");
+ dataMap.put("ZSZFZR", "");
+ dataMap.put("ZSZRQ", "");
}
- if(ys.booleanValue() == false){
- dataMap.put("YSZYY","");
- dataMap.put("YSZFZR","");
- dataMap.put("YSZRQ","");
+ if (ys.booleanValue() == false) {
+ dataMap.put("YSZYY", "");
+ dataMap.put("YSZFZR", "");
+ dataMap.put("YSZRQ", "");
}
- if(qf.booleanValue() == false){
- dataMap.put("QYFZYY","");
- dataMap.put("QYFZFZR","");
- dataMap.put("QYFZRQ","");
+ if (qf.booleanValue() == false) {
+ dataMap.put("QYFZYY", "");
+ dataMap.put("QYFZFZR", "");
+ dataMap.put("QYFZRQ", "");
}
- if(zf.booleanValue() == false){
- dataMap.put("ZFZYY","");
- dataMap.put("ZFZFZR","");
- dataMap.put("ZFZRQ","");
+ if (zf.booleanValue() == false) {
+ dataMap.put("ZFZYY", "");
+ dataMap.put("ZFZFZR", "");
+ dataMap.put("ZFZRQ", "");
}
- if(yf.booleanValue() == false){
- dataMap.put("YFZYY","");
- dataMap.put("YFZFZR","");
- dataMap.put("YFZRQ","");
+ if (yf.booleanValue() == false) {
+ dataMap.put("YFZYY", "");
+ dataMap.put("YFZFZR", "");
+ dataMap.put("YFZRQ", "");
}
- if(yx.booleanValue() == false){
- dataMap.put("YXYY","");
- dataMap.put("YXFZR","");
- dataMap.put("YXRQ","");
+ if (yx.booleanValue() == false) {
+ dataMap.put("YXYY", "");
+ dataMap.put("YXFZR", "");
+ dataMap.put("YXRQ", "");
}
- if(xc.booleanValue() == false){
- dataMap.put("XCYY","");
- dataMap.put("XCFZR","");
- dataMap.put("XCRQ","");
+ if (xc.booleanValue() == false) {
+ dataMap.put("XCYY", "");
+ dataMap.put("XCFZR", "");
+ dataMap.put("XCRQ", "");
}
- if(zyjm.booleanValue() == false){
- dataMap.put("ZYYY","");
- dataMap.put("ZYFZR","");
- dataMap.put("ZYRQ","");
+ if (zyjm.booleanValue() == false) {
+ dataMap.put("ZYYY", "");
+ dataMap.put("ZYFZR", "");
+ dataMap.put("ZYRQ", "");
}
- if(yyjm.booleanValue() == false){
- dataMap.put("YYYY","");
- dataMap.put("YYFZR","");
- dataMap.put("YYRQ","");
+ if (yyjm.booleanValue() == false) {
+ dataMap.put("YYYY", "");
+ dataMap.put("YYFZR", "");
+ dataMap.put("YYRQ", "");
}
}
@@ -506,8 +521,7 @@
@ApiOperation("鏁版嵁澶у睆鑾峰彇鍗犳瘮缁熻")
@GetMapping(value = "/getStats")
- public AjaxResult getStats(TimeVO timeVO)
- {
+ public AjaxResult getStats(TimeVO timeVO) {
return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
index 2d89c9d..9e9700e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -1,9 +1,15 @@
package com.ruoyi.web.controller.project;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.List;
+
+import com.ruoyi.project.domain.BaseOnlyvalue;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
+import com.ruoyi.web.controller.common.OnlyValueCommon;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -24,24 +30,28 @@
/**
* 澶栧洿鍗曚綅浜哄憳Controller
- *
+ *
* @author ruoyi
* @date 2021-11-24
*/
@RestController
@RequestMapping("/project/externalperson")
-public class ServiceExternalpersonController extends BaseController
-{
+public class ServiceExternalpersonController extends BaseController {
@Autowired
private IServiceExternalpersonService serviceExternalpersonService;
+
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
+
+ @Autowired
+ private OnlyValueCommon onlyValueCommon;
/**
* 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃
*/
//@PreAuthorize("@ss.hasPermi('project:externalperson:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceExternalperson serviceExternalperson)
- {
+ public TableDataInfo list(ServiceExternalperson serviceExternalperson) {
startPage();
List<ServiceExternalperson> list = serviceExternalpersonService.queryList(serviceExternalperson);
return getDataTable(list);
@@ -53,8 +63,7 @@
//@PreAuthorize("@ss.hasPermi('project:externalperson:export')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceExternalperson serviceExternalperson)
- {
+ public AjaxResult export(ServiceExternalperson serviceExternalperson) {
List<ServiceExternalperson> list = serviceExternalpersonService.queryList(serviceExternalperson);
ExcelUtil<ServiceExternalperson> util = new ExcelUtil<ServiceExternalperson>(ServiceExternalperson.class);
return util.exportExcel(list, "澶栧洿鍗曚綅浜哄憳鏁版嵁");
@@ -65,8 +74,7 @@
*/
//@PreAuthorize("@ss.hasPermi('project:externalperson:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceExternalpersonService.getById(id));
}
@@ -77,8 +85,10 @@
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson)
- {
+ public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson) {
+ String zj = onlyValueCommon.addOnlyValue("zj");
+ String formattedNumber = String.format("%05d", zj);
+ serviceExternalperson.setUserno(formattedNumber);
return toAjax(serviceExternalpersonService.save(serviceExternalperson));
}
@@ -88,9 +98,8 @@
//@PreAuthorize("@ss.hasPermi('project:externalperson:edit')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.UPDATE)
@PostMapping("/editZJInfo")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceExternalperson serviceExternalperson)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceExternalperson serviceExternalperson) {
return toAjax(serviceExternalpersonService.updateById(serviceExternalperson));
}
@@ -100,8 +109,7 @@
//@PreAuthorize("@ss.hasPermi('project:externalperson:remove')")
@Log(title = "澶栧洿鍗曚綅浜哄憳", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceExternalpersonService.removeByIds(Arrays.asList(ids)));
}
@@ -111,8 +119,7 @@
*/
@GetMapping(value = "/getInfoByUserNo/{userno}")
- public AjaxResult getInfoByUserNo(@PathVariable("userno") String userno)
- {
+ public AjaxResult getInfoByUserNo(@PathVariable("userno") String userno) {
return AjaxResult.success(serviceExternalpersonService.getInfoByUserNo(userno));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
index b081144..8e0fec5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -117,7 +117,7 @@
/**
* 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�
*/
- @ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
+ @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉鍙疯幏鍙栬垂鐢ㄧ敵璇锋槑缁嗕俊鎭�")
@PostMapping("/getDataBybeneficiaryNo")
public AjaxResult getDataBybeneficiaryNo(@RequestBody FunddetailReqVo funddetailReqVo) {
List<ServiceFunddetail> dataBybeneficiaryNo = serviceFunddetailService.getDataBybeneficiaryNo(funddetailReqVo);
@@ -125,12 +125,12 @@
}
/**
- * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�
+ * 鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦
*
- * @param taxMoneyVo 鍙楃泭浜虹紪鍙�
+ * @param taxMoneyVo 韬唤璇佺紪鍙�
* @return
*/
- @ApiOperation("鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�")
+ @ApiOperation("鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦")
@PostMapping("/getTaxByBeneFiciaryNo")
public AjaxResult getTaxBeforeByBeneFiciaryNo(@RequestBody TaxMoneyVO taxMoneyVo) {
return AjaxResult.success(serviceFunddetailService.getTaxByBeneFiciaryNo(taxMoneyVo));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
index 186c1b6..313f3fe 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -163,6 +163,10 @@
//瀵瑰墠绔紶杩囨潵鐨勬暟缁勶紝杩涜JSON搴忓垪鍖栵紝骞惰祴鍊肩粰Annexfiles
serviceReimbursementdetail.setAnnexfiles(JSON.toJSONString(serviceReimbursementdetailVO.getAnnexfilesList()));
}
+ if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
+ //瀵瑰墠绔紶杩囨潵鐨勬暟缁勶紝杩涜JSON搴忓垪鍖栵紝骞惰祴鍊肩粰Invoicefiles
+ serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
+ }
return toAjax(serviceReimbursementdetailService.updateById(serviceReimbursementdetail));
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java
index b475b3e..23fb8c1 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/FunddetailReqVo.java
@@ -25,8 +25,8 @@
/**
* 鏈嶅姟瀵硅薄鍚嶇О
*/
- @ApiModelProperty("鍙楃泭浜虹紪鍙�")
- private String beneficiaryNo;
+ @ApiModelProperty("韬唤璇佺紪鍙�")
+ private String idcardno;
/**
* 鐢宠寮�濮嬫椂闂�
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
index 4099d3d..633b0a3 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetail.java
@@ -214,6 +214,10 @@
@Excel(name = "鍙戠エ寮犳暟")
private Long invoicecount;
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ @Excel(name = "涓婁紶鏃堕棿")
+ private BigDecimal reimbursementamount;
/**
* 绋庡悗閲戦
*/
@@ -336,7 +340,9 @@
/**
* 闄勪欢鏂囦欢鍦板潃
*/
- @ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
+ /** 鍙戠エ闄勪欢 */
+ @ApiModelProperty("鍙戠エ闄勪欢")
+ @Excel(name = "鍙戠エ闄勪欢")
private String invoicefiles;
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
index 374fce1..0b35a35 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceFunddetailVO.java
@@ -342,13 +342,13 @@
* 鍙戠エ鏂囦欢鍦板潃闆嗗悎锛堢敤浜庢帴鏀跺墠绔紶鏉ョ殑鍦板潃锛�
*/
@ApiModelProperty("鍙戠エ鏂囦欢鍦板潃闆嗗悎")
- private List invoiceFilesList;
+ private List invoicefilesList;
/**
* 闄勪欢鏂囦欢鍦板潃
*/
@ApiModelProperty("鍙戠エ鏂囦欢鍦板潃")
- private String invoiceFiles;
+ private String invoicefiles;
/**
* 璁＄畻绋庤垂鏃堕棿
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyVO.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyVO.java
index 9917f56..79386b4 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyVO.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/TaxMoneyVO.java
@@ -7,9 +7,9 @@
public class TaxMoneyVO extends BaseEntity {
/**
- * 鍙楃泭浜虹紪鍙�
+ * 韬唤璇佸彿
*/
- private String beneficiaryNo;
+ private String idcardno;
/**
* 宸ヨ祫
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
index b0ce052..47799aa 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceFunddetailService.java
@@ -35,7 +35,7 @@
List<ServiceFunddetail> getDataBybeneficiaryNo(FunddetailReqVo funddetailReqVo);
/**
- * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�
+ * 鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦
*
* @param taxMoneyVo
* @return
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index daf25c0..ed36b4a 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -1,27 +1,25 @@
package com.ruoyi.project.service.impl;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.domain.BaseOnlyvalue;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.countByRecordStateVO;
import com.ruoyi.project.mapper.*;
+import com.ruoyi.project.service.IBaseOnlyvalueService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.util.ArrayList;
-import java.util.Map;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
@@ -48,6 +46,9 @@
@Autowired
ServiceDonationwitnessMapper serviceDonationwitnessMapper;
+
+ @Autowired
+ private IBaseOnlyvalueService baseOnlyvalueService;
/**
@@ -141,22 +142,36 @@
String number = "";
- if (completeDonation < 10) {
- number = "000" + completeDonation;
- } else if (completeDonation >= 10 && completeDonation < 100) {
- number = "00" + completeDonation;
- } else if (completeDonation >= 100 && completeDonation < 1000) {
- number = "0" + completeDonation;
- } else {
- number = "" + completeDonation;
+// if (completeDonation < 10) {
+// number = "000" + completeDonation;
+// } else if (completeDonation >= 10 && completeDonation < 100) {
+// number = "00" + completeDonation;
+// } else if (completeDonation >= 100 && completeDonation < 1000) {
+// number = "0" + completeDonation;
+// } else {
+// number = "" + completeDonation;
+// }
+ Calendar calendar = Calendar.getInstance();
+ int year = calendar.get(Calendar.YEAR);
+ BaseOnlyvalue baseOnlyvalue = new BaseOnlyvalue();
+ baseOnlyvalue.setAppentvalue(String.valueOf(year));
+ baseOnlyvalue.setBusinesstype("donationwitness");
+ List<BaseOnlyvalue> baseOnlyvalues = baseOnlyvalueService.queryList(baseOnlyvalue);
+ Long currentvalue = baseOnlyvalues.get(0).getCurrentvalue();
+ if (currentvalue == null) {
+ log.error("鍞竴鍊间负绌轰簡锛�");
+ return null;
}
+ //濡傛灉currentvalue涓嶆弧瓒�4浣嶏紝鍒欏湪鍓嶉潰琛�0
+ String formattedNumber = String.format("%04d", currentvalue);
int last = oldDonateNumber.lastIndexOf("*");
if (last == -1) {
return oldDonateNumber;
} else {
StringBuilder newDonateNumber = new StringBuilder(oldDonateNumber);
- newDonateNumber.replace(last - 3, last + 1, number);
+// newDonateNumber.replace(last - 3, last + 1, number);
+ newDonateNumber.replace(last - 3, last + 1, formattedNumber);
String updateNumber = newDonateNumber.toString();
int result = serviceDonatebaseinfoMapper.updateDonateNumber(id, updateNumber);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index 356e921..7649c23 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -696,8 +696,8 @@
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
serviceFunddetailVO.setAnnexfiles(JSON.toJSONString(serviceFunddetailVO.getAnnexfilesList()));
}
- if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoiceFilesList())) {
- serviceFunddetailVO.setInvoiceFiles(JSON.toJSONString(serviceFunddetailVO.getInvoiceFilesList()));
+ if (!CollectionUtils.isEmpty(serviceFunddetailVO.getInvoicefilesList())) {
+ serviceFunddetailVO.setInvoicefiles(JSON.toJSONString(serviceFunddetailVO.getInvoicefilesList()));
}
ServiceFunddetail serviceFunddetail = DtoConversionUtils.sourceToTarget(serviceFunddetailVO, ServiceFunddetail.class);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
index 78a704c..e418e42 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java
@@ -112,7 +112,7 @@
}
/**
- * 鏍规嵁鍙楃泭浜虹紪鍙疯幏鍙栫◣璐归噾棰�
+ * 鏍规嵁鍙楃泭浜鸿韩浠借瘉缂栧彿鑾峰彇绋庤垂閲戦
*
* @param taxMoneyVo
* @return
@@ -241,6 +241,10 @@
List<RbDetailFile> rbDetailFiles = JSONArray.parseArray(serviceFunddetailVO.getAnnexfiles(), RbDetailFile.class);
serviceFunddetailVO.setAnnexfilesList(rbDetailFiles);
}
+ if (!StringUtils.isEmpty(serviceFunddetailVO.getInvoicefiles())) {
+ List<RbDetailFile> rbDetailFiles = JSONArray.parseArray(serviceFunddetailVO.getInvoicefiles(), RbDetailFile.class);
+ serviceFunddetailVO.setInvoicefilesList(rbDetailFiles);
+ }
}
return serviceFunddetailVOS;
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
index a744c94..0c9d0dd 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceReimbursementServiceImpl.java
@@ -125,6 +125,7 @@
for (int j = 0; j < rbDetailList.size(); j++) {
ServiceReimbursementdetail serviceReimbursementdetail = rbDetailList.get(j);
String annexfiles = serviceReimbursementdetail.getAnnexfiles();
+ String invoicefiles = serviceReimbursementdetail.getInvoicefiles();
ServiceReimbursementdetailVO serviceReimbursementdetailVO = DtoConversionUtils.sourceToTarget(serviceReimbursementdetail, ServiceReimbursementdetailVO.class);
if (StringUtils.isNotBlank(annexfiles)) {
try {
@@ -135,6 +136,14 @@
}
}
}
+ if (StringUtils.isNotBlank(invoicefiles)) {
+ try {
+ serviceReimbursementdetailVO.setInvoicefilesList(JSON.parseArray(invoicefiles));
+ } catch (Exception e) {
+ if (e.getMessage().equals("invalid comment")) {
+ }
+ }
+ }
serviceReimbursementdetailVOS.add(serviceReimbursementdetailVO);
}
return serviceReimbursementdetailVOS;
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml
index e8717c5..c730ca5 100644
--- a/ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseOnlyvalueMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.BaseOnlyvalueMapper">
+<mapper namespace="com.ruoyi.project.mapper.BaseOnlyvalueMapper">
<resultMap type="com.ruoyi.project.domain.BaseOnlyvalue" id="BaseOnlyvalueResult">
<result property="id" column="id"/>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
index f0ec17e..31e3320 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFunddetailMapper.xml
@@ -5,63 +5,63 @@
<mapper namespace="com.ruoyi.project.mapper.ServiceFunddetailMapper">
<resultMap type="com.ruoyi.project.domain.ServiceFunddetail" id="ServiceFunddetailResult">
- <result property="id" column="ID"/>
- <result property="fundid" column="fundID"/>
- <result property="beneficiaryname" column="BeneficiaryName"/>
- <result property="beneficiaryno" column="BeneficiaryNo"/>
- <result property="unitname" column="UnitName"/>
- <result property="unitno" column="UnitNo"/>
- <result property="unituserno" column="UnitUserNo"/>
- <result property="title" column="Title"/>
- <result property="idcardtype" column="IDCardType"/>
- <result property="idcardno" column="IDCardNo"/>
- <result property="sex" column="Sex"/>
- <result property="familyrelations" column="FamilyRelations"/>
- <result property="phone" column="Phone"/>
- <result property="depositbank" column="DepositBank"/>
- <result property="bankcardno" column="BankCardNo"/>
- <result property="branchbankname" column="BranchBankName"/>
- <result property="annexbankcard" column="AnnexBankCard"/>
- <result property="annexregistform" column="AnnexRegistForm"/>
- <result property="applytype" column="ApplyType"/>
- <result property="applytypename" column="ApplyTypeName"/>
- <result property="itemid" column="ItemID"/>
- <result property="itemname" column="ItemName"/>
- <result property="itemtype" column="ItemType"/>
- <result property="amount" column="Amount"/>
- <result property="prepaidamount" column="PrepaidAmount"/>
- <result property="taxamount" column="TaxAmount"/>
- <result property="invoicecount" column="InvoiceCount"/>
- <result property="taxedamount" column="TaxedAmount"/>
- <result property="attachcount" column="AttachCount"/>
- <result property="remark" column="Remark"/>
- <result property="recordstatus" column="RecordStatus"/>
- <result property="price" column="Price"/>
- <result property="quantity" column="Quantity"/>
- <result property="del_flag" column="del_flag"/>
- <result property="createBy" column="create_by"/>
- <result property="createTime" column="create_time"/>
- <result property="updateBy" column="update_by"/>
- <result property="updateTime" column="update_time"/>
- <result property="uploadflag" column="uploadflag"/>
- <result property="uploadtime" column="uploadtime"/>
- <result property="infoid" column="InfoId"/>
- <result property="donorno" column="DonorNo"/>
- <result property="donorname" column="DonorName"/>
- <result property="servicesscope" column="SERVICESSCOPE"/>
- <result property="servicesscopename" column="SERVICESSCOPENAME"/>
- <result property="servicetype" column="SERVICETYPE"/>
- <result property="servicetypename" column="SERVICETYPENAME"/>
- <result property="orderno" column="OrderNo"/>
- <result property="itemcode" column="ItemCode"/>
- <result property="subjecttype" column="subjecttype"/>
- <result property="subjecttypename" column="subjecttypename"/>
- <result property="annexfiles" column="AnnexFiles"/>
- <result property="invoicefiles" column="InvoiceFiles"/>
-
- <result property="taxTime" column="tax_time"/>
- <result property="jxrq" column="jxrq"/>
- <result property="itemdescribe" column="ItemDescribe"/>
+ <result property="id" column="ID" />
+ <result property="fundid" column="fundID" />
+ <result property="orderno" column="OrderNo" />
+ <result property="itemid" column="ItemID" />
+ <result property="itemcode" column="ItemCode" />
+ <result property="itemname" column="ItemName" />
+ <result property="itemdescribe" column="ItemDescribe" />
+ <result property="itemtype" column="ItemType" />
+ <result property="applytype" column="ApplyType" />
+ <result property="applytypename" column="ApplyTypeName" />
+ <result property="beneficiaryname" column="BeneficiaryName" />
+ <result property="beneficiaryno" column="BeneficiaryNo" />
+ <result property="unitname" column="UnitName" />
+ <result property="unitno" column="UnitNo" />
+ <result property="unituserno" column="UnitUserNo" />
+ <result property="title" column="Title" />
+ <result property="idcardtype" column="IDCardType" />
+ <result property="idcardno" column="IDCardNo" />
+ <result property="sex" column="Sex" />
+ <result property="familyrelations" column="FamilyRelations" />
+ <result property="phone" column="Phone" />
+ <result property="depositbank" column="DepositBank" />
+ <result property="bankcardno" column="BankCardNo" />
+ <result property="branchbankname" column="BranchBankName" />
+ <result property="annexbankcard" column="AnnexBankCard" />
+ <result property="annexregistform" column="AnnexRegistForm" />
+ <result property="quantity" column="Quantity" />
+ <result property="price" column="Price" />
+ <result property="amount" column="Amount" />
+ <result property="taxamount" column="TaxAmount" />
+ <result property="taxedamount" column="TaxedAmount" />
+ <result property="prepaidamount" column="PrepaidAmount" />
+ <result property="invoicecount" column="InvoiceCount" />
+ <result property="attachcount" column="AttachCount" />
+ <result property="remark" column="Remark" />
+ <result property="infoid" column="InfoId" />
+ <result property="donorno" column="DonorNo" />
+ <result property="donorname" column="DonorName" />
+ <result property="recordstatus" column="RecordStatus" />
+ <result property="del_flag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="uploadflag" column="uploadflag" />
+ <result property="uploadtime" column="uploadtime" />
+ <result property="servicesscope" column="SERVICESSCOPE" />
+ <result property="servicesscopename" column="SERVICESSCOPENAME" />
+ <result property="servicetype" column="SERVICETYPE" />
+ <result property="servicetypename" column="SERVICETYPENAME" />
+ <result property="reimbursementamount" column="REIMBURSEMENTAMOUNT" />
+ <result property="subjecttype" column="subjecttype" />
+ <result property="subjecttypename" column="subjecttypename" />
+ <result property="annexfiles" column="AnnexFiles" />
+ <result property="taxTime" column="tax_time" />
+ <result property="jxrq" column="jxrq" />
+ <result property="invoicefiles" column="InvoiceFiles" />
</resultMap>
<sql id="selectServiceFunddetailVo">
@@ -240,7 +240,7 @@
service_fund b
where a.del_flag = '0'
and a.fundID = b.id
- <if test="beneficiaryNo != null and beneficiaryNo != '' ">and a.beneficiaryNo = #{beneficiaryNo}</if>
+ <if test="idcardno != null and idcardno != '' ">and a.IDCardNo = #{idcardno}</if>
and b.create_time >= #{starttime}
and b.create_time <= #{endtime}
@@ -249,7 +249,7 @@
<select id="getTaxBeforeByBeneFiciaryNo" parameterType="com.ruoyi.project.domain.vo.TaxMoneyVO"
resultMap="ServiceFunddetailResult">
<include refid="selectServiceFunddetailVo"/>
- where create_time like concat(#{startTime}, '%') and beneficiaryNo=#{beneficiaryNo}
+ where create_time like concat(#{startTime}, '%') and IDCardNo=#{idcardno}
</select>
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
index 02b0021..98d50f6 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceReimbursementdetailMapper.xml
@@ -42,7 +42,7 @@
</resultMap>
<sql id="selectServiceReimbursementdetailVo">
- select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType,TrafficType2, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo,personname,persontype from service_reimbursementdetail
+ select ID, RBID, StartTime, Departure, EndTime, Destination, Days, TrafficExpense, TrafficType,TrafficType2, CityFee, HotelExpense, InvoiceCount, AttachCount, OtherExpense, FoodExpenses, FoodAllowance, AnnexFiles,InvoiceFiles, remark, del_flag, create_by, create_time, update_by, update_time, upload_flag, upload_time, travelprovince, travelprovincename, travelcity, travelcityname, traveltown, traveltownname, otherfeeamount, otherfeedesc, OrderNo,personname,persontype from service_reimbursementdetail
</sql>
<select id="selectServiceReimbursementdetailList" parameterType="com.ruoyi.project.domain.ServiceReimbursementdetail" resultMap="ServiceReimbursementdetailResult">
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 8a7c5ce..6bf644f 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -182,7 +182,7 @@
//鏌ュ嚭鎵�鏈夎鍖婚櫌閫�鍥炵殑Fund鏁版嵁
List<ServiceFundShared> serviceFundShareds = serviceFundSharedService.queryFundShareList();
for (ServiceFundShared serviceFundShared : serviceFundShareds) {
- if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
+ if (StringUtils.isNotBlank(serviceFundShared.getOabdzt()) && serviceFundShared.getOabdzt().equals("宸叉挙閿�")) {
//濡傛灉鏈夎储鍔￠┏鍥炰俊鎭鏄庢槸閫�鍥炵殑
String[] split = serviceFundShared.getCxrjyj().split("&");
String phone = serviceFundShared.getPhone();
@@ -277,10 +277,10 @@
}
serviceFundflow.setFlowcontent(spname + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
// 999 閫氳繃
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundShared.setSpjg(1);
fundflowService.save(serviceFundflow);
@@ -324,9 +324,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getPresident().substring(0, serviceFundShared.getPresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getPresident().substring(0, serviceFundShared.getPresident().indexOf(" ")) + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -355,9 +355,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getFinvicepresident().substring(0, serviceFundShared.getFinvicepresident().indexOf(" ")) + "瀹℃壒閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -385,9 +385,9 @@
serviceFundflow.setCheckusername(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")));
serviceFundflow.setFlowcontent(serviceFundShared.getBusvicepresident().substring(0, serviceFundShared.getBusvicepresident().indexOf(" ")) + "閫氳繃");
serviceFundflow.setFlowconclusion(1);
- serviceFundflow.setFundtype(1);
+ serviceFundflow.setFundtype(2);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype(serviceFundShared.getApplytype());
serviceFundflow.setFundid(serviceFundShared.getSerfunid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -508,7 +508,7 @@
serviceFundflow.setFundtype(1);
// 999 閫氳繃
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
serviceReimbursementShared.setSpjg(1);
@@ -553,7 +553,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
serviceFundflow.setCheckTime(parse);
fundflowService.save(serviceFundflow);
@@ -584,7 +584,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setCheckTime(parse);
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
fundflowService.save(serviceFundflow);
@@ -614,7 +614,7 @@
serviceFundflow.setFlowconclusion(1);
serviceFundflow.setFundtype(1);
serviceFundflow.setFlowlevel(999);
- serviceFundflow.setApplytype(null);
+ serviceFundflow.setApplytype("0");
serviceFundflow.setCheckTime(parse);
serviceFundflow.setFundid(serviceReimbursementShared.getReimid());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index 0ed0c0a..df51a3a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -1,18 +1,20 @@
package com.ruoyi.system.mapper;
import java.util.List;
+
import com.ruoyi.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Mapper;
/**
* 鍙傛暟閰嶇疆 鏁版嵁灞�
- *
+ *
* @author ruoyi
*/
-public interface SysConfigMapper
-{
+@Mapper
+public interface SysConfigMapper {
/**
* 鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@@ -20,7 +22,7 @@
/**
* 鏌ヨ鍙傛暟閰嶇疆鍒楄〃
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 鍙傛暟閰嶇疆闆嗗悎
*/
@@ -28,7 +30,7 @@
/**
* 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
+ *
* @param configKey 鍙傛暟閿悕
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@@ -36,7 +38,7 @@
/**
* 鏂板鍙傛暟閰嶇疆
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@@ -44,7 +46,7 @@
/**
* 淇敼鍙傛暟閰嶇疆
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@@ -52,7 +54,7 @@
/**
* 鍒犻櫎鍙傛暟閰嶇疆
- *
+ *
* @param configId 鍙傛暟ID
* @return 缁撴灉
*/
@@ -60,7 +62,7 @@
/**
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
- *
+ *
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
* @return 缁撴灉
*/
--
Gitblit v1.9.3