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为：{}，Organno为：{}", 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 { 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) { 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(); 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()); 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"> 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); }
