代码提交

liusheng

2023-11-10 6f344e6360751574f7e03b21c00cfa3f4b2bc099

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseAnnextype;
import com.ruoyi.project.service.IBaseAnnextypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * æçŒ®é™„件Controller
 *
 * @author ruoyi
 * @date 2023-11-10
 */
@Slf4j
@Api("捐献附件")
@RestController
@RequestMapping("/project/annextype")
public class BaseAnnextypeController extends BaseController {
    @Autowired
    private IBaseAnnextypeService baseAnnextypeService;

    /**
     * æŸ¥è¯¢æçŒ®é™„件列表
     */
    @ApiOperation("查询捐献附件列表")
    @PreAuthorize("@ss.hasPermi('system:annextype:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseAnnextype baseAnnextype) {
        startPage();
        List<BaseAnnextype> list = baseAnnextypeService.queryList(baseAnnextype);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæçŒ®é™„件列表
     */
    @ApiOperation("导出捐献附件列表")
    @PreAuthorize("@ss.hasPermi('system:annextype:export')")
    @Log(title = "捐献附件", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseAnnextype baseAnnextype) {
        log.info("导出捐献附件列表{}：", baseAnnextype);
        List<BaseAnnextype> list = baseAnnextypeService.queryList(baseAnnextype);
        ExcelUtil<BaseAnnextype> util = new ExcelUtil<BaseAnnextype>(BaseAnnextype.class);
        return util.exportExcel(list, "捐献附件数据");
    }

    /**
     * èŽ·å–捐献附件详细信息
     */
    @ApiOperation("获取捐献附件详细信息")
    @PreAuthorize("@ss.hasPermi('system:annextype:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取捐献附件详细信息{}：", id);

        return AjaxResult.success(baseAnnextypeService.getById(id));
    }

    /**
     * æ–°å¢žæçŒ®é™„件
     */
    @ApiOperation("新增捐献附件")
    @PreAuthorize("@ss.hasPermi('system:annextype:add')")
    @Log(title = "捐献附件", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseAnnextype baseAnnextype) {
        log.info("新增捐献附件{}：", baseAnnextype);

        if (ObjectUtils.isEmpty(baseAnnextype) || StringUtils.isEmpty(baseAnnextype.getDonationcategory()) || StringUtils.isEmpty(baseAnnextype.getAnnextype())) {
            throw new BaseException("请检查捐献类别和附件类型，为空了");
        }
        return toAjax(baseAnnextypeService.save(baseAnnextype));
    }

    /**
     * ä¿®æ”¹æçŒ®é™„件
     */
    @ApiOperation("修改捐献附件")
    @PreAuthorize("@ss.hasPermi('system:annextype:edit')")
    @Log(title = "捐献附件", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseAnnextype baseAnnextype) {
        log.info("修改捐献附件的入参{}：", baseAnnextype);

        if (ObjectUtils.isEmpty(baseAnnextype) || baseAnnextype.getId() == null) {
            throw new BaseException("修改的条件为空");
        }
        return toAjax(baseAnnextypeService.updateById(baseAnnextype));
    }

    /**
     * åˆ é™¤æçŒ®é™„件
     */
    @ApiOperation("删除捐献附件")
    @PreAuthorize("@ss.hasPermi('system:annextype:remove')")
    @Log(title = "捐献附件", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除捐献附件{}：", ids);

        return toAjax(baseAnnextypeService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java

@@ -5,6 +5,7 @@

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +32,7 @@
 * @author ruoyi
 * @date 2022-04-19
 */
@Slf4j
@Api("专家费用")
@RestController
@RequestMapping("/project/expertfeetype")
@@ -44,6 +46,7 @@
    @ApiOperation("查询专家费用列表")
    @GetMapping("/list")
    public TableDataInfo list(BaseExpertfeetype baseExpertfeetype) {
        log.info("查询专家费用列表{}：", baseExpertfeetype);
        startPage();
        List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
        return getDataTable(list);
@@ -56,6 +59,7 @@
    @Log(title = "专家费用", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseExpertfeetype baseExpertfeetype) {
        log.info("导出专家费用列表{}：", baseExpertfeetype);
        List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
        ExcelUtil<BaseExpertfeetype> util = new ExcelUtil<BaseExpertfeetype>(BaseExpertfeetype.class);
        return util.exportExcel(list, "专家费用数据");
@@ -67,6 +71,7 @@
    @ApiOperation("获取专家费用详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取专家费用详细信息{}：", id);
        return AjaxResult.success(baseExpertfeetypeService.getById(id));
    }

@@ -78,6 +83,7 @@
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype) {
        log.info("新增专家费用{}：", baseExpertfeetype);
        return toAjax(baseExpertfeetypeService.save(baseExpertfeetype));
    }

@@ -89,6 +95,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseExpertfeetype baseExpertfeetype) {
        log.info("修改专家费用{}：", baseExpertfeetype);
        return toAjax(baseExpertfeetypeService.updateById(baseExpertfeetype));
    }

@@ -99,6 +106,7 @@
    @Log(title = "专家费用", businessType = BusinessType.DELETE)
    @DeleteMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除专家费用{}：", ids);
        return toAjax(baseExpertfeetypeService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java

@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseFinancesubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -23,6 +24,7 @@
 * @author ruoyi
 * @date 2022-01-11
 */
@Slf4j
@Api("收入费用科目")
@RestController
@RequestMapping("/project/financesubject")
@@ -39,6 +41,7 @@
    @GetMapping("/list")
    public TableDataInfo list(BaseFinancesubject baseFinancesubject)
    {
        log.info("查询收入费用科目列表{}：" , baseFinancesubject);
        startPage();
        //List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);、
        List<BaseFinancesubject> list = baseFinancesubjectService.selectBaseFinancesubjectList(baseFinancesubject);
@@ -54,6 +57,7 @@
    @GetMapping("/export")
    public AjaxResult export(BaseFinancesubject baseFinancesubject)
    {
        log.info("导出收入费用科目列表{}：" , baseFinancesubject);
        List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
        ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
        return util.exportExcel(list, "收入费用科目数据");
@@ -67,6 +71,7 @@
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        log.info("获取收入费用科目详细信息{}：" , id);
        return AjaxResult.success(baseFinancesubjectService.getById(id));
    }

@@ -80,6 +85,7 @@
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
    {
        log.info("新增收入费用科目{}：" , baseFinancesubject);
        return toAjax(baseFinancesubjectService.save(baseFinancesubject));
    }

@@ -93,6 +99,7 @@
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
    {
        log.info("修改收入费用科目{}：" , baseFinancesubject);
        return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
    }

@@ -105,11 +112,13 @@
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        log.info("删除收入费用科目{}：" , ids);
        return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
    }

    @GetMapping(value = "/getItemName/{ItemType}")
    public AjaxResult getItemName(@PathVariable("ItemType") String ItemType){
        log.info("/getItemName的入参 {}：" , ItemType);
        return AjaxResult.success(baseFinancesubjectService.getItemName(ItemType));
    }

@@ -117,6 +126,7 @@
    @Log(title = "获取捐献成本", businessType = BusinessType.OTHER)
    @GetMapping(value = "/getDonationCost/{DonorNo}")
    public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo){
        log.info("获取捐献成本{}：" , DonorNo);
        return AjaxResult.success(baseFinancesubjectService.getDonationCost(DonorNo));
    }

@@ -129,6 +139,7 @@
    @GetMapping("/getbyexpensetype/{ExpenseType}")
    public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
    {
        log.info("根据费用大类获取项目类型{}：" , ExpenseType);
        /*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
        baseFinancesubject.setExpensetype(ExpenseType);
        List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
@@ -146,6 +157,7 @@
    @GetMapping("/getDetails/{ExpenseType}")
    public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
    {
        log.info("根据费用大类获取项目明细{}：" , ExpenseType);
        return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java

@@ -2,8 +2,10 @@

import java.util.Arrays;
import java.util.List;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@

/**
 * æ”¶å…¥è´¹ç”¨ç§‘ç›®Controller
 * 
 *
 * @author ruoyi
 * @date 2022-05-11
 */
@Slf4j
@Api("收入费用科目")
@RestController
@RequestMapping("/project/itemexpense")
public class BaseItemexpenseController extends BaseController
{
public class BaseItemexpenseController extends BaseController {
    @Autowired
    private IBaseItemexpenseService baseItemexpenseService;

@@ -43,8 +45,8 @@
     */
    @ApiOperation("查询收入费用科目列表")
    @GetMapping("/list")
    public TableDataInfo list(BaseItemexpense baseItemexpense)
    {
    public TableDataInfo list(BaseItemexpense baseItemexpense) {
        log.info("查询收入费用科目列表{}：" , baseItemexpense);
        startPage();
        List<BaseItemexpense> list = baseItemexpenseService.queryList(baseItemexpense);
        return getDataTable(list);
@@ -56,8 +58,8 @@
    @ApiOperation("导出收入费用科目列表")
    @Log(title = "收入费用科目", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseItemexpense baseItemexpense)
    {
    public AjaxResult export(BaseItemexpense baseItemexpense) {
        log.info("导出收入费用科目列表{}：" , baseItemexpense);
        List<BaseItemexpense> list = baseItemexpenseService.queryList(baseItemexpense);
        ExcelUtil<BaseItemexpense> util = new ExcelUtil<BaseItemexpense>(BaseItemexpense.class);
        return util.exportExcel(list, "收入费用科目数据");
@@ -68,8 +70,8 @@
     */
    @ApiOperation("获取收入费用科目详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取收入费用科目详细信息{}：" , id);
        return AjaxResult.success(baseItemexpenseService.getById(id));
    }

@@ -80,8 +82,8 @@
    @Log(title = "收入费用科目", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense)
    {
    public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense) {
        log.info("新增收入费用科目{}：" , baseItemexpense);
        return toAjax(baseItemexpenseService.save(baseItemexpense));
    }

@@ -91,9 +93,9 @@
    @ApiOperation("修改收入费用科目")
    @Log(title = "收入费用科目", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseItemexpense baseItemexpense)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseItemexpense baseItemexpense) {
        log.info("修改收入费用科目{}：" , baseItemexpense);
        return toAjax(baseItemexpenseService.updateById(baseItemexpense));
    }

@@ -103,8 +105,8 @@
    @ApiOperation("删除收入费用科目")
    @Log(title = "收入费用科目", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除收入费用科目{}：" , ids);
        return toAjax(baseItemexpenseService.removeByIds(Arrays.asList(ids)));
    }

@@ -113,11 +115,10 @@
     */
    @ApiOperation("通过项目id获取收入费用科目详细信息")
    @GetMapping(value = "/getDetailsByItemId/{itemid}")
    public AjaxResult getDetailsByItemId(@PathVariable("itemid") Long itemid)
    {
    public AjaxResult getDetailsByItemId(@PathVariable("itemid") Long itemid) {
        log.info("通过项目id获取收入费用科目详细信息{}：" , itemid);
        return AjaxResult.success(baseItemexpenseService.getDetailsByItemId(itemid));
    }



}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java

@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseOrganchargeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@
 * @author ruoyi
 * @date 2023-10-08
 */
@Slf4j
@Api("人体器官获取费用")
@RestController
@RequestMapping("/organcharge")
@@ -38,6 +40,7 @@
    @PreAuthorize("@ss.hasPermi('system:organcharge:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
        log.info("查询人体器官获取费用列表{}：" , baseOrgancharge);
        startPage();
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        return getDataTable(list);
@@ -51,6 +54,7 @@
    @Log(title = "人体器官获取费用", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrgancharge baseOrgancharge) {
        log.info("导出人体器官获取费用列表{}：" , baseOrgancharge);
        List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
        ExcelUtil<BaseOrgancharge> util = new ExcelUtil<BaseOrgancharge>(BaseOrgancharge.class);
        return util.exportExcel(list, "人体器官获取费用数据");
@@ -63,6 +67,7 @@
    @PreAuthorize("@ss.hasPermi('system:organcharge:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取人体器官获取费用详细信息{}：" , id);
        return AjaxResult.success(baseOrganchargeService.getById(id));
    }

@@ -75,6 +80,7 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
        log.info("新增人体器官获取费用{}：" , baseOrgancharge);
        return toAjax(baseOrganchargeService.save(baseOrgancharge));
    }

@@ -87,6 +93,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
        log.info("修改人体器官获取费用{}：" , baseOrgancharge);
        return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
    }

@@ -97,6 +104,7 @@
    @PreAuthorize("@ss.hasPermi('system:organcharge:remove')")
    @GetMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除人体器官获取费用{}：" , ids);
        return toAjax(baseOrganchargeService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java

@@ -12,6 +12,7 @@
import com.ruoyi.web.controller.common.OnlyValueCommon;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@
 * @author ruoyi
 * @date 2021-11-05
 */
@Slf4j
@Api("机构信息管理")
@RestController
@RequestMapping("/project/organization")
@@ -42,6 +44,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrganization baseOrganization) {
        log.info("获取机构列表{}：" , baseOrganization);
        startPage();
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        return getDataTable(list);
@@ -55,6 +58,7 @@
    @Log(title = "机构管理", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrganization baseOrganization) {
        log.info("导出机构信息{}：" , baseOrganization);
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
        return util.exportExcel(list, "机构管理数据");
@@ -67,6 +71,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取机构管理详细信息{}：" , id);
        return AjaxResult.success(baseOrganizationService.getById(id));
    }

@@ -79,6 +84,7 @@
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
        log.info("新增机构信息{}：" , baseOrganization);
        String organization = onlyValueCommon.addOnlyValue("organization");
        //"0"+地市编码+医院类型+序号
        baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
@@ -94,6 +100,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
        log.info("修改机构信息{}：" , baseOrganization);
        return toAjax(baseOrganizationService.updateById(baseOrganization));
    }

@@ -105,6 +112,7 @@
    @Log(title = "机构管理", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除机构信息{}：" , ids);
        return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java

@@ -5,6 +5,7 @@

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,15 +28,15 @@

/**
 * çœå¸‚区管理Controller
 * 
 *
 * @author ruoyi
 * @date 2021-11-15
 */
@Slf4j
@Api("省市区管理")
@RestController
@RequestMapping("/project/dict")
public class BasePrcaddressDictController extends BaseController
{
public class BasePrcaddressDictController extends BaseController {
    @Autowired
    private IBasePrcaddressDictService basePrcaddressDictService;

@@ -45,8 +46,8 @@
    @ApiOperation("获取省市区列表")
    //@PreAuthorize("@ss.hasPermi('project:dict:list')")
    @GetMapping("/list")
    public TableDataInfo list(BasePrcaddressDict basePrcaddressDict)
    {
    public TableDataInfo list(BasePrcaddressDict basePrcaddressDict) {
        log.info("查询省市区管理列表{}：", basePrcaddressDict);
        startPage();
        List<BasePrcaddressDict> list = basePrcaddressDictService.queryList(basePrcaddressDict);
        return getDataTable(list);
@@ -57,8 +58,8 @@
     */
    @ApiOperation("获取省市区下拉树列表")
    @GetMapping("/treeselect")
    public AjaxResult treeselect(BasePrcaddressDict basePrcaddressDict)
    {
    public AjaxResult treeselect(BasePrcaddressDict basePrcaddressDict) {
        log.info("获取省市区下拉树列表{}：", basePrcaddressDict);
        List<BasePrcaddressDict> basePrcaddressDicts = basePrcaddressDictService.queryList(basePrcaddressDict);
        return AjaxResult.success(basePrcaddressDictService.buildAddressTreeSelect(basePrcaddressDicts));
    }
@@ -71,8 +72,8 @@
    //@PreAuthorize("@ss.hasPermi('project:dict:export')")
    @Log(title = "省市区管理", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BasePrcaddressDict basePrcaddressDict)
    {
    public AjaxResult export(BasePrcaddressDict basePrcaddressDict) {
        log.info("导出省市区列表{}：", basePrcaddressDict);
        List<BasePrcaddressDict> list = basePrcaddressDictService.queryList(basePrcaddressDict);
        ExcelUtil<BasePrcaddressDict> util = new ExcelUtil<BasePrcaddressDict>(BasePrcaddressDict.class);
        return util.exportExcel(list, "省市区管理数据");
@@ -84,8 +85,8 @@
    @ApiOperation("通过id获得省市区")
    //@PreAuthorize("@ss.hasPermi('project:dict:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取省市区管理详细信息{}：", id);
        return AjaxResult.success(basePrcaddressDictService.getById(id));
    }

@@ -97,8 +98,8 @@
    @Log(title = "省市区管理", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BasePrcaddressDict basePrcaddressDict)
    {
    public AjaxResult add(@RequestBody BasePrcaddressDict basePrcaddressDict) {
        log.info("新增省市区{}：", basePrcaddressDict);
        return toAjax(basePrcaddressDictService.save(basePrcaddressDict));
    }

@@ -109,9 +110,9 @@
    //@PreAuthorize("@ss.hasPermi('project:dict:edit')")
    @Log(title = "省市区管理", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BasePrcaddressDict basePrcaddressDict)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BasePrcaddressDict basePrcaddressDict) {
        log.info("修改省市区管理{}：", basePrcaddressDict);
        return toAjax(basePrcaddressDictService.updateById(basePrcaddressDict));
    }

@@ -122,8 +123,8 @@
    //@PreAuthorize("@ss.hasPermi('project:dict:remove')")
    @Log(title = "省市区管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除省市区管理{}：", ids);
        return toAjax(basePrcaddressDictService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java

@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseTravelcityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,15 +21,15 @@

/**
 * å·®æ—…城市和补贴标准Controller
 * 
 *
 * @author ruoyi
 * @date 2023-04-23
 */
@Slf4j
@Api("差旅城市和补贴标准")
@RestController
@RequestMapping("/project/travelcity")
public class BaseTravelcityController extends BaseController
{
public class BaseTravelcityController extends BaseController {
    @Autowired
    private IBaseTravelcityService baseTravelcityService;

@@ -38,8 +39,8 @@
    @ApiOperation("查询差旅城市和补贴标准列表")
    @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseTravelcity baseTravelcity)
    {
    public TableDataInfo list(BaseTravelcity baseTravelcity) {
        log.info("查询差旅城市和补贴标准列表{}：", baseTravelcity);
        startPage();
        List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
        return getDataTable(list);
@@ -52,8 +53,8 @@
    @PreAuthorize("@ss.hasPermi('project:travelcity:export')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseTravelcity baseTravelcity)
    {
    public AjaxResult export(BaseTravelcity baseTravelcity) {
        log.info("导出差旅城市和补贴标准列表{}：", baseTravelcity);
        List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
        ExcelUtil<BaseTravelcity> util = new ExcelUtil<BaseTravelcity>(BaseTravelcity.class);
        return util.exportExcel(list, "差旅城市和补贴标准数据");
@@ -65,8 +66,8 @@
    @ApiOperation("获取差旅城市和补贴标准详细信息")
    @PreAuthorize("@ss.hasPermi('project:travelcity:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取差旅城市和补贴标准详细信息{}：", id);
        return AjaxResult.success(baseTravelcityService.getById(id));
    }

@@ -78,8 +79,8 @@
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity)
    {
    public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity) {
        log.info("新增差旅城市和补贴标准{}：", baseTravelcity);
        return toAjax(baseTravelcityService.save(baseTravelcity));
    }

@@ -90,9 +91,9 @@
    @PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity) {
        log.info("修改差旅城市和补贴标准{}：", baseTravelcity);
        return toAjax(baseTravelcityService.updateById(baseTravelcity));
    }

@@ -103,8 +104,8 @@
    @PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除差旅城市和补贴标准{}：", ids);
        return toAjax(baseTravelcityService.removeByIds(Arrays.asList(ids)));
    }

@@ -113,11 +114,11 @@
     * æ ¹æ®åŒºåŸŸèŽ·å–伙食补助、公杂要补助
     */
    @ApiOperation("根据区域获取补助")
   // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
    @GetMapping("/getSubsidy/{cityCode}")
    public AjaxResult getSubsidy(@PathVariable String cityCode)
    {
        BaseTravelcity baseTravelcity=baseTravelcityService.getSubsidy(cityCode);
    public AjaxResult getSubsidy(@PathVariable String cityCode) {
        log.info("根据区域获取伙食补助、公杂要补助{}：", cityCode);
        BaseTravelcity baseTravelcity = baseTravelcityService.getSubsidy(cityCode);
        return AjaxResult.success(baseTravelcity);
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java

@@ -7,6 +7,7 @@
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.PropertySource;
@@ -21,6 +22,7 @@
 * @author liusheng
 * @date 2023-05-15
 */
@Slf4j
@Api(description = "钉钉接口")
@RestController
@RequestMapping("/smartor/dingtalk")
@@ -45,6 +47,7 @@
    @ApiOperation("发送钉钉消息")
    @PostMapping("/sendNotification")
    public AjaxResult sendNotification(@RequestBody DingTalkReqVo dingTalkReqVo) {
        log.info("发送钉钉消息：{}", dingTalkReqVo);
        Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
        if (aBoolean) {
            return success();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java

@@ -2,8 +2,10 @@

import java.util.Arrays;
import java.util.List;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@

/**
 * ä¸“家费用分发汇总明细Controller
 * 
 *
 * @author ruoyi
 * @date 2022-03-01
 */
@Slf4j
@Api("专家费用分发汇总明细")
@RestController
@RequestMapping("/project/distributedetail")
public class ServiceDistributedetailController extends BaseController
{
public class ServiceDistributedetailController extends BaseController {
    @Autowired
    private IServiceDistributedetailService serviceDistributedetailService;

@@ -43,8 +45,8 @@
     */
    @ApiOperation("查询专家费用分发汇总明细列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDistributedetail serviceDistributedetail)
    {
    public TableDataInfo list(ServiceDistributedetail serviceDistributedetail) {
        log.info("查询专家费用分发汇总明细列表：{}", serviceDistributedetail);
        startPage();
        List<ServiceDistributedetail> list = serviceDistributedetailService.queryList(serviceDistributedetail);
        return getDataTable(list);
@@ -56,8 +58,8 @@
    @ApiOperation("导出专家费用分发汇总明细列表")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDistributedetail serviceDistributedetail)
    {
    public AjaxResult export(ServiceDistributedetail serviceDistributedetail) {
        log.info("导出专家费用分发汇总明细列表：{}", serviceDistributedetail);
        List<ServiceDistributedetail> list = serviceDistributedetailService.queryList(serviceDistributedetail);
        ExcelUtil<ServiceDistributedetail> util = new ExcelUtil<ServiceDistributedetail>(ServiceDistributedetail.class);
        return util.exportExcel(list, "专家费用分发汇总明细数据");
@@ -68,8 +70,8 @@
     */
    @ApiOperation("获取专家费用分发汇总明细详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取专家费用分发汇总明细详细信息：{}", id);
        return AjaxResult.success(serviceDistributedetailService.getById(id));
    }

@@ -80,8 +82,8 @@
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail)
    {
    public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail) {
        log.info("新增专家费用分发汇总明细：{}", serviceDistributedetail);
        return toAjax(serviceDistributedetailService.save(serviceDistributedetail));
    }

@@ -91,9 +93,9 @@
    @ApiOperation("修改专家费用分发汇总明细")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDistributedetail serviceDistributedetail)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDistributedetail serviceDistributedetail) {
        log.info("修改专家费用分发汇总明细：{}", serviceDistributedetail);
        return toAjax(serviceDistributedetailService.updateById(serviceDistributedetail));
    }

@@ -103,8 +105,8 @@
    @ApiOperation("删除专家费用分发汇总明细")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除专家费用分发汇总明细：{}", ids);
        return toAjax(serviceDistributedetailService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java

@@ -2,8 +2,10 @@

import java.util.Arrays;
import java.util.List;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@

/**
 * ä¸“家费用分发汇总主Controller
 * 
 *
 * @author ruoyi
 * @date 2022-03-01
 */
@Slf4j
@Api("专家费用分发汇总主")
@RestController
@RequestMapping("/project/distributesummary")
public class ServiceDistributesummaryController extends BaseController
{
public class ServiceDistributesummaryController extends BaseController {
    @Autowired
    private IServiceDistributesummaryService serviceDistributesummaryService;

@@ -43,8 +45,8 @@
     */
    @ApiOperation("查询专家费用分发汇总主列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDistributesummary serviceDistributesummary)
    {
    public TableDataInfo list(ServiceDistributesummary serviceDistributesummary) {
        log.info("查询专家费用分发汇总主列表：{}", serviceDistributesummary);
        startPage();
        List<ServiceDistributesummary> list = serviceDistributesummaryService.queryList(serviceDistributesummary);
        return getDataTable(list);
@@ -56,8 +58,8 @@
    @ApiOperation("导出专家费用分发汇总主列表")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDistributesummary serviceDistributesummary)
    {
    public AjaxResult export(ServiceDistributesummary serviceDistributesummary) {
        log.info("导出专家费用分发汇总主列表：{}", serviceDistributesummary);
        List<ServiceDistributesummary> list = serviceDistributesummaryService.queryList(serviceDistributesummary);
        ExcelUtil<ServiceDistributesummary> util = new ExcelUtil<ServiceDistributesummary>(ServiceDistributesummary.class);
        return util.exportExcel(list, "专家费用分发汇总主数据");
@@ -68,8 +70,8 @@
     */
    @ApiOperation("获取专家费用分发汇总主详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取专家费用分发汇总主详细信息：{}", id);
        return AjaxResult.success(serviceDistributesummaryService.getById(id));
    }

@@ -80,8 +82,8 @@
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary)
    {
    public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary) {
        log.info("新增专家费用分发汇总主：{}", serviceDistributesummary);
        return toAjax(serviceDistributesummaryService.save(serviceDistributesummary));
    }

@@ -91,9 +93,9 @@
    @ApiOperation("修改专家费用分发汇总主")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDistributesummary serviceDistributesummary)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDistributesummary serviceDistributesummary) {
        log.info("修改专家费用分发汇总主：{}", serviceDistributesummary);
        return toAjax(serviceDistributesummaryService.updateById(serviceDistributesummary));
    }

@@ -103,16 +105,16 @@
    @ApiOperation("删除专家费用分发汇总主")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除专家费用分发汇总主：{}", ids);
        return toAjax(serviceDistributesummaryService.removeByIds(Arrays.asList(ids)));
    }

    @GetMapping(value ="/getSummaryByInfoId/{infoid}")
    public AjaxResult getSummaryByInfoId(@PathVariable("infoid") Long infoid){
    @GetMapping(value = "/getSummaryByInfoId/{infoid}")
    public AjaxResult getSummaryByInfoId(@PathVariable("infoid") Long infoid) {
        log.info("getSummaryByInfoId的入参：{}", infoid);
        return AjaxResult.success(serviceDistributesummaryService.getSummaryByInfoId(infoid));
    }



}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java

@@ -2,8 +2,10 @@

import java.util.Arrays;
import java.util.List;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@

/**
 * æçŒ®é™„件Controller
 * 
 *
 * @author ruoyi
 * @date 2022-04-08
 */
@Slf4j
@Api("捐献附件")
@RestController
@RequestMapping("/project/documentfiles")
public class ServiceDocumentfilesController extends BaseController
{
public class ServiceDocumentfilesController extends BaseController {
    @Autowired
    private IServiceDocumentfilesService serviceDocumentfilesService;

@@ -43,8 +45,8 @@
     */
    @ApiOperation("查询捐献附件列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDocumentfiles serviceDocumentfiles)
    {
    public TableDataInfo list(ServiceDocumentfiles serviceDocumentfiles) {
        log.info("查询捐献附件列表：{}", serviceDocumentfiles);
        startPage();
        //List<ServiceDocumentfiles> list = serviceDocumentfilesService.queryList(serviceDocumentfiles);
        List<ServiceDocumentfiles> list = serviceDocumentfilesService.selectList(serviceDocumentfiles);
@@ -57,8 +59,8 @@
    @ApiOperation("导出捐献附件列表")
    @Log(title = "捐献附件", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDocumentfiles serviceDocumentfiles)
    {
    public AjaxResult export(ServiceDocumentfiles serviceDocumentfiles) {
        log.info("导出捐献附件列表：{}", serviceDocumentfiles);
        List<ServiceDocumentfiles> list = serviceDocumentfilesService.queryList(serviceDocumentfiles);
        ExcelUtil<ServiceDocumentfiles> util = new ExcelUtil<ServiceDocumentfiles>(ServiceDocumentfiles.class);
        return util.exportExcel(list, "捐献附件数据");
@@ -69,8 +71,8 @@
     */
    @ApiOperation("获取捐献附件详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取捐献附件详细信息：{}", id);
        return AjaxResult.success(serviceDocumentfilesService.getById(id));
    }

@@ -81,8 +83,8 @@
    @Log(title = "捐献附件", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles)
    {
    public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
        log.info("新增捐献附件：{}", serviceDocumentfiles);
        return toAjax(serviceDocumentfilesService.save(serviceDocumentfiles));
    }

@@ -92,9 +94,9 @@
    @ApiOperation("修改捐献附件")
    @Log(title = "捐献附件", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDocumentfiles serviceDocumentfiles)
    {
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
        log.info("修改捐献附件：{}", serviceDocumentfiles);
        return toAjax(serviceDocumentfilesService.updateById(serviceDocumentfiles));
    }

@@ -104,8 +106,8 @@
    @ApiOperation("删除捐献附件")
    @Log(title = "捐献附件", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除捐献附件：{}", ids);
        return toAjax(serviceDocumentfilesService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java

@@ -7,6 +7,7 @@
import com.ruoyi.project.domain.vo.DonateAnnexVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,7 @@
 * @author ruoyi
 * @date 2021-11-11
 */
@Slf4j
@Api("附件管理")
@RestController
@RequestMapping("/project/donateannex")
@@ -48,6 +50,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateannex:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateannex serviceDonateannex) {
        log.info("附件管理列表：{}", serviceDonateannex);
        startPage();
        List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
        return getDataTable(list);
@@ -55,6 +58,7 @@

    @GetMapping("/listnew")
    public TableDataInfo listnew(DonateAnnexVO donateAnnexVO) {
        log.info("listnew的入参：{}", donateAnnexVO);
        startPage();
        List<DonateAnnexVO> list = serviceDonateannexService.selectVOList(donateAnnexVO);
        return getDataTable(list);
@@ -69,6 +73,7 @@
    @Log(title = "捐献附件", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateannex serviceDonateannex) {
        log.info("导出捐献附件列表：{}", serviceDonateannex);
        List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
        ExcelUtil<ServiceDonateannex> util = new ExcelUtil<ServiceDonateannex>(ServiceDonateannex.class);
        return util.exportExcel(list, "捐献附件数据");
@@ -81,6 +86,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateannex:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("通过id获得捐献附件信息：{}", id);
        return AjaxResult.success(serviceDonateannexService.getById(id));
    }

@@ -93,6 +99,7 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
        log.info("新增捐献附件信息：{}", serviceDonateannexs.size());
        return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
    }

@@ -105,6 +112,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex) {
        log.info("修改捐献附件信息：{}", serviceDonateannex);
        return toAjax(serviceDonateannexService.updateById(serviceDonateannex));
    }

@@ -118,6 +126,7 @@
    @PostMapping("/editannexfiles")
    @RepeatSubmit
    public AjaxResult editannexfiles(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
        log.info("修改潜在捐献、伦理审查、完成登记、医学评估附件信息：{}", serviceDonateannexs.size());
        return toAjax(serviceDonateannexService.updateOrSave(serviceDonateannexs));
    }

@@ -129,6 +138,7 @@
    @Log(title = "捐献附件", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除捐献文件信息：{}", ids);
        return toAjax(serviceDonateannexService.removeByIds(Arrays.asList(ids)));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java

@@ -5,6 +5,7 @@

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +32,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Slf4j
@Api("捐献要求附件管理")
@RestController
@RequestMapping("/project/donateannexrequirement")
@@ -45,6 +47,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateannexrequirement serviceDonateannexrequirement) {
        log.info("捐献要求附件管理列表：{}", serviceDonateannexrequirement);
        startPage();
        List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
        return getDataTable(list);
@@ -58,6 +61,7 @@
    @Log(title = "捐献附件要求", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateannexrequirement serviceDonateannexrequirement) {
        log.info("导出捐献要求附件管理列表：{}", serviceDonateannexrequirement);
        List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
        ExcelUtil<ServiceDonateannexrequirement> util = new ExcelUtil<ServiceDonateannexrequirement>(ServiceDonateannexrequirement.class);
        return util.exportExcel(list, "捐献附件要求数据");
@@ -70,6 +74,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("通过id获取捐献要求附件：{}", id);
        return AjaxResult.success(serviceDonateannexrequirementService.getById(id));
    }

@@ -82,6 +87,7 @@
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
        log.info("新增捐献要求附件信息：{}", serviceDonateannexrequirement);
        return toAjax(serviceDonateannexrequirementService.save(serviceDonateannexrequirement));
    }

@@ -94,6 +100,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
        log.info("修改捐献要求附件信息：{}", serviceDonateannexrequirement);
        return toAjax(serviceDonateannexrequirementService.updateById(serviceDonateannexrequirement));
    }

@@ -105,6 +112,7 @@
    @Log(title = "捐献附件要求", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除捐献要求附件信息：{}", ids);
        return toAjax(serviceDonateannexrequirementService.removeByIds(Arrays.asList(ids)));
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java

@@ -23,6 +23,7 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -39,6 +40,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Slf4j
@Api("潜在捐献信息管理")
@RestController
@RequestMapping("/project/donatebaseinfo")
@@ -70,6 +72,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献信息列表：{}", serviceDonatebaseinfo);
        startPage();
        //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
@@ -79,6 +82,7 @@
    @ApiOperation("小程序端潜在捐献信息列表")
    @GetMapping("/listForSearch")
    public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("小程序端潜在捐献信息列表：{}", serviceDonatebaseinfo);
        startPage();
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
        return getDataTable(list);
@@ -93,6 +97,7 @@
    @Log(title = "捐献基础", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("导出潜在捐献信息列表：{}", serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
        return util.exportExcel(list, "捐献基础数据");
@@ -105,6 +110,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("通过id获得潜在捐献信息：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
    }

@@ -117,6 +123,7 @@
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("新增潜在捐献信息：{}", serviceDonatebaseinfo);
        SysUser user = SecurityUtils.getLoginUser().getUser();

        String bh = "";
@@ -158,6 +165,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("修改潜在捐献信息：{}", serviceDonatebaseinfo);
        return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
    }

@@ -169,12 +177,14 @@
    @Log(title = "捐献基础", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除潜在捐献信息：{}", ids);
        return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
    }

    @ApiOperation("获取捐献编号")
    @GetMapping("/donatenumber")
    public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("获取捐献编号：{}", serviceDonatebaseinfo);
        return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
    }

@@ -182,11 +192,13 @@
    @ApiOperation("获取捐献报告人")
    @GetMapping("/reportName/{usertype}")
    public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
        log.info("获取捐献报告人：{}", usertype);
        return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
    }

    @GetMapping(value = "/updateS1S2S3S4/{id}")
    public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
        log.info("updateS1S2S3S4的入参：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
    }

@@ -196,6 +208,7 @@
    @ApiOperation("通过id下载人体器官潜在捐献者登记表")
    @GetMapping(value = "/download/{id}")
    public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
        log.info("通过id下载人体器官潜在捐献者登记表：{}", id);
        Map dataMap = new HashMap();
        getData(dataMap, id);
        String filePath = getClass().getResource("/template/").getPath();
@@ -925,6 +938,7 @@
    @ApiOperation("获取状态获取计数")
    @GetMapping("/countByRecordState")
    public AjaxResult countByRecordState(TimeVO timeVO) {
        log.info("获取状态获取计数：{}", timeVO);
        return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
    }

@@ -934,6 +948,7 @@
    @ApiOperation("获取捐献工作流")
    @GetMapping(value = "/getWorkFlow/{id}")
    public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
        log.info("获取捐献工作流：{}", id);
        return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
    }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java

@@ -19,6 +19,7 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -33,6 +34,7 @@
 * @author ruoyi
 * @date 2021-11-19
 */
@Slf4j
@Api("捐献完成登记管理")
@RestController
@RequestMapping("/project/donatecompletioninfo")
@@ -57,6 +59,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("查询捐献完成列表：{}", serviceDonatecompletioninfo);
        startPage();
        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
        return getDataTable(list);
@@ -66,6 +69,7 @@
    @GetMapping("/listnew")
    @Log(title = "查询捐献完成列表（新）", businessType = BusinessType.OTHER)
    public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
        log.info("查询捐献完成列表（新）：{}", donationCompletionVO);
        startPage();
        List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
        return getDataTable(list);
@@ -80,6 +84,7 @@
    @Log(title = "捐献完成", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("导出捐献完成列表（新）：{}", serviceDonatecompletioninfo);
        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
        ExcelUtil<ServiceDonatecompletioninfo> util = new ExcelUtil<ServiceDonatecompletioninfo>(ServiceDonatecompletioninfo.class);
        return util.exportExcel(list, "捐献完成数据");
@@ -92,6 +97,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("通过id获取某一条捐献完成信息：{}", id);
        return AjaxResult.success(serviceDonatecompletioninfoService.getById(id));
    }

@@ -104,6 +110,7 @@
    @PostMapping
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java

@@ -1,37 +1,28 @@
package com.ruoyi.web.controller.project;

import java.util.Arrays;
import java.util.List;

import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.*;
import com.ruoyi.project.domain.vo.DonateOrganVO;
import com.ruoyi.project.domain.vo.NumberOfOrgans;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceOrganallocationService;
import io.swagger.annotations.Api;
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;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.project.service.IServiceDonateorganService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonateorganVO;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.domain.vo.DonateOrganVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonateorganService;
import com.ruoyi.project.service.IServiceOrganallocationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * æçŒ®å™¨å®˜ç®¡ç†Controller
@@ -61,12 +52,12 @@
        List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
        if (!CollectionUtils.isEmpty(list)) {
            List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
            for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
                ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
                serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
                List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
                serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
            }
//            for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
//                ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
//                serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
//                List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
//                serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
//            }
            return getDataTable(serviceDonateorganVOS);
        }

@@ -142,6 +133,19 @@
        return saveDataTable(serviceDonateorgans1);
    }


    /**
     * ä¿®æ”¹å™¨å®˜åˆ†é…
     */
    @ApiOperation("修改器官分配信息")
    //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
    @Log(title = "器官分配", businessType = BusinessType.UPDATE)
    @PostMapping("/editarraydata")
    @RepeatSubmit
    public AjaxResult editArrayData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
        return AjaxResult.success(serviceDonateorganService.editArrayData(serviceDonateorgans));
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜ç®¡ç†
     */

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java

@@ -7,29 +7,21 @@
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;
import io.swagger.annotations.Api;
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;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java

@@ -705,6 +705,7 @@
        return toAjax(false);
    }


    /**
     * åˆ é™¤è´¹ç”¨ç”³è¯·ä¸»
     */
@@ -2126,7 +2127,7 @@
    @RepeatSubmit
    public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
        Boolean totaltax = serviceFundService.totaltax(totalTaxVO);
        if(totaltax){
        if (totaltax) {
            return AjaxResult.success("合计个税成功,请去E:\\OPO\\WEB\\Upload\\download ä¸­æŸ¥æ‰¾æ–‡ä»¶");
        }


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java

@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.Education;
import com.ruoyi.common.enums.NationalityEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
@@ -130,13 +131,16 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
        ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
        serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
        List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
        if (CollectionUtils.isEmpty(list)) {
            return error("捐献亲属确认数据不存在,请检查后再次修改");
        if (serviceRelativesconfirmation.getInfoid() == null || serviceRelativesconfirmation.getId() == null) {
            throw new BaseException("请联系工程师检查ID是否为空");
        }
        serviceRelativesconfirmation.setId(list.get(0).getId());
//        ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
//        serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
//        List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
//        if (CollectionUtils.isEmpty(list)) {
//            return error("捐献亲属确认数据不存在,请检查后再次修改");
//        }
//        serviceRelativesconfirmation.setId(list.get(0).getId());
        return toAjax(serviceRelativesconfirmationService.updateById(serviceRelativesconfirmation));
    }


 ruoyi-common/src/main/java/com/ruoyi/common/utils/ChineseUtils.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
package com.ruoyi.common.utils;

public class ChineseUtils {

    /**
     * æ ¡éªŒæ˜¯å¦æ˜¯ä¸­æ–‡
     *
     * @param str
     * @return
     */
    public static boolean isChinese(String str) {
        String regex = "[\\u4e00-\\u9fa5]+";
        return str.matches(regex);
    }
}

 ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseAnnextype.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.ruoyi.project.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æçŒ®é™„件对象 base_annextype
 * 
 * @author ruoyi
 * @date 2023-11-10
 */
@Data
@ApiModel("捐献附件")
public class BaseAnnextype extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /** æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory（DBD、DCD、DBCD） */
    @ApiModelProperty("捐献类别 æ ¹æ®å­—å…¸sys_DonationCategory（DBD、DCD、DBCD）")
    @Excel(name = "捐献类别 æ ¹æ®å­—å…¸sys_DonationCategory", readConverterExp = "D=BD、DCD、DBCD")
    private String donationcategory;

    /** é™„件类型（0 æ½œåœ¨æçŒ®ï¼Œ1 åŒ»å­¦è¯„估，2 æçŒ®ç¡®è®¤ï¼Œ3伦理审查，6 å®Œæˆç™»è®°ï¼‰é¡ºåºæ˜¯å’Œé¡µé¢ä¸Šçš„顺序保持一致，没有序号的说明不需要附件 */
    @ApiModelProperty("附件类型（0 æ½œåœ¨æçŒ®ï¼Œ1 åŒ»å­¦è¯„估，2 æçŒ®ç¡®è®¤ï¼Œ3伦理审查，6 å®Œæˆç™»è®°ï¼‰é¡ºåºæ˜¯å’Œé¡µé¢ä¸Šçš„顺序保持一致，没有序号的说明不需要附件")
    @Excel(name = "附件类型", readConverterExp = "0=,潜=在捐献，1,医=学评估，2,捐=献确认，3伦理审查，6,完=成登记")
    private String annextype;

    /** é™„件名称 */
    @ApiModelProperty("附件名称")
    @Excel(name = "附件名称")
    private String annexname;

    /** å¿…须附件的标识 */
    @ApiModelProperty("必须附件的标识")
    @Excel(name = "必须附件的标识")
    private Long need;

    /** åºå· */
    @ApiModelProperty("序号")
    @Excel(name = "序号")
    private Long seqno;

}


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java

@@ -33,6 +33,10 @@
    @ApiModelProperty("关联service_donatebaseinfo表的ID")
    private Long infoid;


    @ApiModelProperty("关联base_annextype表的ID")
    private Long annextypeid;

    /**
     * æçŒ®è€…编号
     */

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java

@@ -301,5 +301,12 @@
    private Integer transplantstate;



    /** ç³»ç»Ÿç¼–号 */
    @ApiModelProperty("系统编号")
    @Excel(name = "系统编号")
    private String caseno;


}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseAnnextypeMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.BaseAnnextype;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æçŒ®é™„件Mapper接口
 * 
 * @author ruoyi
 * @date 2023-11-10
 */
@Mapper
public interface BaseAnnextypeMapper extends BaseMapper<BaseAnnextype>
{
    /**
     * æŸ¥è¯¢æçŒ®é™„件列表
     *
     * @param baseAnnextype æçŒ®é™„件
     * @return æçŒ®é™„件集合
     */
    public List<BaseAnnextype> selectBaseAnnextypeList(BaseAnnextype baseAnnextype);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseAnnextypeService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.BaseAnnextype;

import java.util.List;

/**
 * æçŒ®é™„件Service接口
 * 
 * @author ruoyi
 * @date 2023-11-10
 */
public interface IBaseAnnextypeService extends IService<BaseAnnextype>
{

    /**
     * æŸ¥è¯¢æçŒ®é™„件列表
     * 
     * @param baseAnnextype æçŒ®é™„件
     * @return æçŒ®é™„件集合
     */
    public List<BaseAnnextype> queryList(BaseAnnextype baseAnnextype);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.domain.vo.*;
import org.springframework.web.bind.annotation.PathVariable;

@@ -73,5 +74,7 @@

    List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans);

    Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans);


}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseAnnextypeServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.BaseAnnextype;
import com.ruoyi.project.mapper.BaseAnnextypeMapper;
import com.ruoyi.project.service.IBaseAnnextypeService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æçŒ®é™„件Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-11-10
 */
@Service
public class BaseAnnextypeServiceImpl extends ServiceImpl<BaseAnnextypeMapper, BaseAnnextype> implements IBaseAnnextypeService
{


    /**
     * æŸ¥è¯¢æçŒ®é™„件列表
     * 
     * @param baseAnnextype æçŒ®é™„件
     * @return æçŒ®é™„件
     */
    @Override
    public List<BaseAnnextype> queryList(BaseAnnextype baseAnnextype) {
        LambdaQueryWrapper<BaseAnnextype> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(baseAnnextype.getDonationcategory())){
            wrappers.eq(BaseAnnextype::getDonationcategory ,baseAnnextype.getDonationcategory());
        }
        if (StringUtils.isNotBlank(baseAnnextype.getAnnextype())){
            wrappers.eq(BaseAnnextype::getAnnextype ,baseAnnextype.getAnnextype());
        }
        if (StringUtils.isNotBlank(baseAnnextype.getAnnexname())){
            wrappers.like(BaseAnnextype::getAnnexname ,baseAnnextype.getAnnexname());
        }
        if (baseAnnextype.getNeed() != null){
            wrappers.eq(BaseAnnextype::getNeed ,baseAnnextype.getNeed());
        }
        if (baseAnnextype.getSeqno() != null){
            wrappers.eq(BaseAnnextype::getSeqno ,baseAnnextype.getSeqno());
        }
        return this.list(wrappers);
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java

@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.domain.vo.DonateAnnexVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,6 +30,7 @@
 * @author ruoyi
 * @date 2021-11-11
 */
@Slf4j
@Service
public class ServiceDonateannexServiceImpl extends ServiceImpl<ServiceDonateannexMapper, ServiceDonateannex> implements IServiceDonateannexService {

@@ -99,6 +101,7 @@
    @Transactional(rollbackFor = Exception.class)
    public Boolean saveData(List<ServiceDonateannex> serviceDonateannexs) {
        for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
            log.info("serviceDonateannex的信息：{}", serviceDonateannex);
            if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
                throw new BaseException("主表id或附件类型ID为空，请检查后再保存");
            }

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java

@@ -61,6 +61,9 @@
    private IServiceOrganallocationService serviceOrganallocationService;

    @Autowired
    private IServiceDonateorganService serviceDonateorganService;

    @Autowired
    private IServiceDonationwitnessService serviceDonationwitnessService;

    @Autowired
@@ -272,12 +275,12 @@
            return null;
        }
        //封装serviceDonateorgan潜在捐献数据
        Map<String, String> donateorgan = new HashMap<>();
        donateorgan.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
        donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donateorgan.put("process", "");
        Map<String, String> donatebaseinfo = new HashMap<>();
        donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
        donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        map.put("donateorgan", donateorgan);
        map.put("donatebaseinfo", donatebaseinfo);

        //封装医学评估
        Map<String, String> medicalevaluation = new HashMap<>();
@@ -326,19 +329,19 @@
        map.put("ethicalreviewopinions", ethicalreviewopinions);

        //封装器官分配
        Map<String, String> organallocationService = new HashMap<>();
        Map<String, String> donateorgansService = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 4) {
            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
            serviceOrganallocation.setOrganid(id);
            List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
            if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
                organallocationService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getCreateTime()));
                organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getUpdateTime()) : "");
                organallocationService.put("process", "");
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            serviceDonateorgan.setInfoid(id);
            List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
            if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
                donateorgansService.put("process", "");
            }
        }
        //封装器官分配返回数据
        map.put("organallocationService", organallocationService);
        map.put("donateorgansService", donateorgansService);

        //封装获取见证
        Map<String, String> donationwitness = new HashMap<>();

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java

@@ -448,7 +448,8 @@
        donateNumber.setNumberOfDonate(serviceDonatebaseinfoMapper.countNumber(timeVO));
        donateNumber.setNumberOfMedicalEvaluation(serviceMedicalevaluationMapper.countNumber(timeVO));
        donateNumber.setNumberOfRelativeConfirmation(serviceRelativesconfirmationMapper.countNumber(timeVO));
        donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
//        donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
        donateNumber.setNumberOfDonatePeople(serviceDonateorganMapper.countNumber(timeVO));
        donateNumber.setNumberOfOrgans(serviceDonateorganMapper.countNumber(timeVO));
        donateNumber.setNumberOfWitness(serviceDonationwitnessMapper.countNumber(timeVO));
        donateNumber.setNumberOfEthicalReview(serviceEthicalreviewopinionsMapper.countNumber(timeVO));
@@ -748,6 +749,10 @@
    @Transactional(rollbackFor = Exception.class)
    public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
            if (serviceDonateorgan.getInfoid() == null) {
                throw new BaseException("未关联捐献基础信息，infoid为空了" + serviceDonateorgan);
            }

            String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
            if (StringUtils.isEmpty(serviceDonateorgan.getDonorno()) || StringUtils.isEmpty(serviceDonateorgan.getOrganno())) {
                throw new BaseException("新增时生成的编号为空,创建失败(请检查捐献者编号和器官类别)! ï¼š" + serviceDonateorgan.toString());
@@ -764,20 +769,33 @@
            boolean save = this.save(serviceDonateorgan);


            //保存service_organallocation
            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
            serviceOrganallocationService.save(serviceOrganallocation);
//            //保存service_organallocation
//            ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
//            serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
//            serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
//            serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
//            serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
//            serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
//            serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
//            log.info("serviceOrganallocation的数据为: {}", serviceOrganallocation);
//            serviceOrganallocationService.save(serviceOrganallocation);
        }
        return serviceDonateorgans;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans) {
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
            if (serviceDonateorgan.getId() == null) {
                throw new BaseException("id为空了 ï¼š" + serviceDonateorgan);
            }
            this.updateById(serviceDonateorgan);
        }
        //将带ID的数据返回
        return true;
    }


//    @Override
//    public List<DonateByRegionVO> OrgansOfHospitalByMonth() {

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java

@@ -1,13 +1,10 @@
package com.ruoyi.project.service.impl;

import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;

import com.alibaba.fastjson.JSON;
@@ -15,7 +12,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.tax.TaxtUtils;
import com.ruoyi.common.utils.ChineseUtils;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +25,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -692,11 +688,19 @@

        List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
        if (CollectionUtils.isEmpty(serviceFunddetails)) {
            System.out.println("serviceFunddetails为空喽");
            return null;
            throw new BaseException("serviceFunddetails为空喽");
        }
        // ä¿å­˜è¯¦æƒ…数据
        for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
            if (StringUtils.isEmpty(serviceFunddetailVO.getIdcardno())) {
                throw new BaseException("请检查身份证号,身份证号为空了,姓名：" + serviceFunddetailVO.getBeneficiaryname());
            }
            if (StringUtils.isEmpty(serviceFunddetailVO.getTitle()) || ChineseUtils.isChinese(serviceFunddetailVO.getTitle())) {
                throw new BaseException("请检查职称是否为空（或不是中文）,姓名：" + serviceFunddetailVO.getBeneficiaryname() + "  èŒç§°:" + serviceFunddetailVO.getTitle());
            }
            if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
                throw new BaseException("请检查银行卡号是否为空,姓名：" + serviceFunddetailVO.getBeneficiaryname());
            }
            serviceFunddetailVO.setFundid(id);
            //將附件转成json
            if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {

 ruoyi-project/src/main/resources/mapper/project/BaseAnnextypeMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseAnnextypeMapper">
    
    <resultMap type="com.ruoyi.project.domain.BaseAnnextype" id="BaseAnnextypeResult">
        <result property="id"    column="ID"    />
        <result property="donationcategory"    column="donationcategory"    />
        <result property="annextype"    column="annextype"    />
        <result property="annexname"    column="annexname"    />
        <result property="need"    column="need"    />
        <result property="seqno"    column="seqno"    />
        <result property="remark"    column="remark"    />
        <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"    />
    </resultMap>

    <sql id="selectBaseAnnextypeVo">
        select ID, donationcategory, annextype, annexname, need, seqno, remark, del_flag, create_by, create_time, update_by, update_time from base_annextype
    </sql>

    <select id="selectBaseAnnextypeList" parameterType="com.ruoyi.project.domain.BaseAnnextype" resultMap="BaseAnnextypeResult">
        <include refid="selectBaseAnnextypeVo"/>
        <where>
            <if test="donationcategory != null  and donationcategory != ''"> and donationcategory = #{donationcategory}</if>
            <if test="annextype != null  and annextype != ''"> and annextype = #{annextype}</if>
            <if test="annexname != null  and annexname != ''"> and annexname like concat('%', #{annexname}, '%')</if>
            <if test="need != null "> and need = #{need}</if>
            <if test="seqno != null "> and seqno = #{seqno}</if>
        </where>
    </select>

</mapper>

 ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml

@@ -17,10 +17,11 @@
        <result property="annexno"    column="AnnexNo"    />
        <result property="annexurl"    column="AnnexUrl"    />
        <result property="annexfilestype"    column="AnnexfilesType"    />
        <result property="annextypeid"    column="annextypeid"    />
    </resultMap>

    <sql id="selectServiceDonateannexVo">
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl,AnnexfilesType from service_donateannex
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl,AnnexfilesType,annextypeid from service_donateannex
    </sql>

    <select id="selectServiceDonateannexList" parameterType="com.ruoyi.project.domain.ServiceDonateannex" resultMap="ServiceDonateannexResult">

 ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml

@@ -37,6 +37,7 @@
        <result property="applicantusername" column="ApplicantUserName"/>
        <result property="applicanttime" column="ApplicantTime"/>
        <result property="checkuserid" column="CheckUserID"/>
        <result property="caseno"    column="CaseNo"    />
        <result property="checkusername" column="CheckUserName"/>
        <result property="checktime" column="CheckTime"/>
        <result property="checksuggestion" column="CheckSuggestion"/>
@@ -79,6 +80,7 @@
               OrganState,
               OrganNumber,
               OrganGetTime,
               CaseNo,
               OrganGetDoct,
               GainHospitalNo,
               GainHospitalName,