From 2825e5d603737bc596c0aca6c39929949ac240c7 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 09:06:26 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java | 5 -----
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java | 10 +++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 11 +----------
ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml | 1 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 5 -----
6 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
index 80695f9..0df3b16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -108,7 +108,6 @@
}
- @RepeatSubmit
@ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹樿幏鍙�")
@Log(title = "鎹愮尞鍣ㄥ畼鑾峰彇", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonationwitnessorgan")
@@ -119,6 +118,15 @@
Boolean i = null;
for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
log.info("鎹愮尞鍣ㄥ畼鑾峰彇id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
+ //鏍规嵁infoid鍜屽櫒瀹樼紪鍙凤紝鍒ゆ柇杩欎釜鍣ㄥ畼鏄惁宸茬粡瀛樿繘琛ㄤ腑
+ ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
+ serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
+ serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
+ List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
+ log.info("serviceDonationwitnessorgans鐨勬暟閲忎负 : {},infoid涓猴細{}锛孫rganno涓猴細{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {
+ serviceDonationwitnessorgan.setId(serviceDonationwitnessorgans.get(0).getId());
+ }
if (serviceDonationwitnessorgan.getId() == null) {
i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
} else {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
index ecebc12..c11b8ad 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundtaxController.java
@@ -42,7 +42,6 @@
* 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�
*/
@ApiOperation("鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓诲垪琛�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceFundtax serviceFundtax) {
startPage();
@@ -71,7 +70,6 @@
* 鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�
*/
@ApiOperation("鑾峰彇涓撳璐圭敤绠楃◣鐢宠涓昏缁嗕俊鎭�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
ServiceFundtax serviceFundtax = serviceFundtaxService.getById(id);
@@ -86,7 +84,6 @@
* 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("淇敼涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:edit')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
@RepeatSubmit
@@ -98,7 +95,6 @@
* 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:remove')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{id}")
public AjaxResult remove(@PathVariable Long id) {
@@ -110,7 +106,6 @@
* 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
*/
@ApiOperation("鏂板涓撳璐圭敤绠楃◣鐢宠涓�")
- @PreAuthorize("@ss.hasPermi('system:fundtax:add')")
@Log(title = "涓撳璐圭敤绠楃◣鐢宠涓�", businessType = BusinessType.INSERT)
@PostMapping("/addFundTax")
public AjaxResult addFundTax(@RequestBody ServiceFundtax serviceFundtax) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index ea22706..38b065a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -189,11 +189,6 @@
try {
out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outFile), "utf-8"));
-
- } catch (FileNotFoundException e1) {
- e1.printStackTrace();
- }
- try {
t.process(dataMap, out);
} catch (TemplateException e) {
e.printStackTrace();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index b895f1a..6328a4c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -7,15 +7,9 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.model.LoginBodyByOpenID;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.web.config.RabbitMqConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
-import org.springframework.amqp.AmqpException;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessagePostProcessor;
-import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
@@ -45,9 +39,6 @@
@Autowired
private SysPermissionService permissionService;
- @Autowired
- private RabbitTemplate rabbitTemplate;
-
/**
* 寰俊OpenID鐧诲綍鏂规硶
@@ -74,7 +65,7 @@
@ApiOperation("鐧诲綍淇℃伅")
@Log(title = "鐧诲綍淇℃伅", businessType = BusinessType.OTHER)
@PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody) {
+ public AjaxResult login(@RequestBody LoginBody loginBody) {
AjaxResult ajax = AjaxResult.success();
// 鐢熸垚浠ょ墝
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid(), loginBody.getOpenid());
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
index be87022..9d3479d 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceFundMapper.xml
@@ -153,6 +153,7 @@
<if test="infoid != null ">and InfoID = #{infoid}</if>
<if test="donorno != null and donorno != '' ">and DonorNo = #{donorno}</if>
<if test="jxrq != null ">and jxrq = #{jxrq}</if>
+ order by apply_time desc
</select>
<select id="getInfoByInfoId" resultType="com.ruoyi.project.domain.ServiceFund">
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 83bef1a..1097cd0 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
@@ -682,6 +682,7 @@
ServiceFund serviceFund2 = new ServiceFund();
serviceFund2.setId(serviceFund1.getId());
serviceFund2.setUploadStates(2);
+ serviceFund2.setUpdateTime(new Date());
boolean b = serviceFundService.updateById(serviceFund2);
log.info("serviceReimbursement鏄惁鎻掑叆鎴愬姛{},{}", aBoolean, b);
}
--
Gitblit v1.9.3