初步推进融资需求发布

zksy-admin/src/main/java/com/zksy/web/controller/basicData/FaFinancingApplicationController.java

@@ -36,30 +36,30 @@ public class FaFinancingApplicationController extends BaseController{
 
     @GetMapping("/getById/{borrowId}")
     @ApiOperation(value = "融资申请搜索getById")
-    public FaFinancingApplication getById(@PathVariable String borrowId) {
-        return service.getById(borrowId);
+    public AjaxResult getById(@PathVariable String borrowId) {
+        return AjaxResult.success(service.getById(borrowId));
     }
 
     @GetMapping("/findByPage")
     @ApiOperation(value = "融资申请分页")
-    public Page findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
-        return service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson));
+    public AjaxResult findByPage(long pageNum, long pageSize, String conditionJson) throws Exception {
+        return AjaxResult.success(service.page(new Page<>(pageNum, pageSize), SearchUtil.parseWhereSql(conditionJson)));
     }
 
     @GetMapping("/getList")
     @ApiOperation(value = "融资申请查询所有")
-    public List<FaFinancingApplication> getList(String conditionJson) throws Exception {
-        return service.list(SearchUtil.parseWhereSql(conditionJson));
+    public AjaxResult getList(String conditionJson) throws Exception {
+        return AjaxResult.success(service.list(SearchUtil.parseWhereSql(conditionJson)));
     }
 
     /**
      * 新增融资申请
      */
-    @PostMapping("/save")
+    @PostMapping("/saveOrUpdate")
     @ApiOperation(value = "融资申请新增")
     @Log(title = "新增融资申请", businessType = BusinessType.INSERT)
-    public boolean save(@RequestBody FaFinancingApplication faFinancingApplication) {
-        return service.save(faFinancingApplication);
+    public AjaxResult saveOrUpdate(@RequestBody FaFinancingApplication faFinancingApplication) {
+        return service.saveOrUpdateLoanInfo(faFinancingApplication);
     }
 
     /**
@@ -71,6 +71,12 @@ public class FaFinancingApplicationController extends BaseController{
     public boolean updateById(@RequestBody FaFinancingApplication faFinancingApplication) {
         return service.updateById(faFinancingApplication);
     }
+    @GetMapping("/releaseApplicationById")
+    @ApiOperation(value = "发布融资申请")
+    @Log(title = "发布融资申请", businessType = BusinessType.UPDATE)
+    public AjaxResult releaseApplication(Long id){
+        return service.releaseApplication(id);
+    }
 
     @Log(title = "融资申请", businessType = BusinessType.DELETE)
     @PostMapping("/delete")

zksy-system/src/main/java/com/zksy/system/basicData/domain/FaFinancingApplication.java

@@ -88,11 +88,11 @@ private static final long serialVersionUID=1L;
                 @ExcelExport(value = "实际放款金额")
     private BigDecimal actualLendingAmount;
 
-@ApiModelProperty(value = "放款状态")
+@ApiModelProperty(value = "状态(0-待发布,1-待审核,2-已放款,3-未放款,4-已撤销)")
     /** 放款状态 */
-                @ExcelImport(value = "放款状态")
-                @ExcelExport(value = "放款状态")
-    private String lendingStatus;
+                @ExcelImport(value = "状态(0-待发布,1-待审核,2-已放款,3-未放款,4-已撤销)")
+                @ExcelExport(value = "状态(0-待发布,1-待审核,2-已放款,3-未放款,4-已撤销)")
+    private Short status;
 
 @ApiModelProperty(value = "放款时间")
     /** 放款时间 */

zksy-system/src/main/java/com/zksy/system/basicData/service/FaFinancingApplicationService.java

@@ -20,4 +20,8 @@ public interface FaFinancingApplicationService extends IService<FaFinancingAppli
  * @date 2024/5/13 17:12:22
  */
     AjaxResult deleteAll();
+
+    AjaxResult saveOrUpdateLoanInfo(FaFinancingApplication faFinancingApplication);
+
+    AjaxResult releaseApplication(Long id);
 }

zksy-system/src/main/java/com/zksy/system/basicData/service/impl/FaFinancingApplicationServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 融资申请Service业务层处理
@@ -29,4 +30,28 @@ public class FaFinancingApplicationServiceImpl extends ServiceImpl<FaFinancingAp
         utils.del(FaFinancingApplication::getId,mapper);
         return AjaxResult.success("全部删除成功");
     }
+
+    @Override
+    public AjaxResult saveOrUpdateLoanInfo(FaFinancingApplication faFinancingApplication) {
+        faFinancingApplication.setStatus(Short.valueOf("0"));
+        faFinancingApplication.setCreateTime(new Date());
+        if(!this.saveOrUpdate(faFinancingApplication)){
+            throw new RuntimeException("新增融资申请失败");
+        }
+        return AjaxResult.success("成功申请融资");
+    }
+
+    @Override
+    public AjaxResult releaseApplication(Long id) {
+        FaFinancingApplication faFinancingApplication = this.getById(id);
+        if(faFinancingApplication.getStatus() != 0){
+            throw new RuntimeException("融资申请不在发布状态");
+        }
+        faFinancingApplication.setStatus(Short.valueOf("1"));
+        faFinancingApplication.setUpdateTime(new Date());
+        if(!this.updateById(faFinancingApplication)){
+            throw new RuntimeException("发布融资申请失败");
+        }
+        return AjaxResult.success("发布融资申请成功");
+    }
 }

zksy-system/src/main/resources/mapper/basicData/FaFinancingApplicationMapper.xml

@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="financingDemandCode"    column="financing_demand_code"    />
         <result property="requiredAmount"    column="required_amount"    />
         <result property="actualLendingAmount"    column="actual_lending_amount"    />
-        <result property="lendingStatus"    column="lending_status"    />
+        <result property="status"    column="status"    />
         <result property="lendingTime"    column="lending_time"    />
         <result property="demandDescription"    column="demand_description"    />
         <result property="remarkUnlendingReason"    column="remark_unlending_reason"    />