Переглянути джерело

财务结算-修改账户状态、删除。

yangzian 4 роки тому
батько
коміт
5d6c3f9e91

+ 5 - 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java

@@ -1,5 +1,6 @@
 package org.jeecg.common.aspect;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -18,6 +19,7 @@ import org.jeecg.common.system.service.ICoreService;
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;
@@ -134,6 +136,9 @@ public class DictAspect {
                /* if (((Result) result).getResult() instanceof List) {
                     return;
                 }*/
+                if (ObjectUtil.isEmpty(((Result) result).getResult())) {
+                    return;
+                }
                 List<JSONObject> items = new ArrayList<>();
                 for (Object record : ((Result<PageInfo>) result).getResult().getList()){
                     ObjectMapper mapper = new ObjectMapper();

+ 15 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/SettlementController.java

@@ -39,10 +39,25 @@ public class SettlementController {
     public Result getSettlementList(ctopCwjsSettlementInfo settlementInfo,
                                                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+        //TODO 根据用户角色查询列表
        return settlementInfoService.getSettlementList(settlementInfo,pageNo,pageSize);
     }
 
 
+    @ApiOperation(value="财务结算-修改账户状态账户(0-开 1-关)", notes="财务结算-修改账户状态账户(0-开 1-关)")
+    @GetMapping(value = "/updSettlementStatusById")
+    public Result updSettlementStatusById(@RequestParam Long id,@RequestParam Integer status) {
+       return settlementInfoService.updSettlementStatusById(id,status);
+    }
+
+
+    @ApiOperation(value="财务结算-删除", notes="财务结算-删除")
+    @GetMapping(value = "/deleteSettlementById")
+    public Result deleteSettlementById(@RequestParam Long id) {
+       return settlementInfoService.deleteSettlementById(id);
+    }
+
+
 
 
 

+ 19 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/SettlementInfoMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.ctop.finance.settlement.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import io.lettuce.core.dynamic.annotation.Param;
 import org.jeecg.ctop.finance.settlement.entity.pojo.ctopCwjsSettlementInfo;
 
 import java.util.List;
@@ -16,6 +17,24 @@ import java.util.List;
  */
 public interface SettlementInfoMapper extends BaseMapper<ctopCwjsSettlementInfo> {
 
+    /**
+     *查询 财务结算-账户列表
+     * @param settlementInfo
+     * @return
+     */
     List<ctopCwjsSettlementInfo> getSettlementList(ctopCwjsSettlementInfo settlementInfo);
 
+    /**
+     *修改财务结算账户状态
+     * @param id
+     * @param status
+     */
+    void updSettlementStatusById(@Param("id") Long id, @Param("status") Integer status);
+
+    /**
+     * 删除财务结算账户
+     * @param id
+     */
+    void deleteSettlementById(@Param("id") Long id);
+
 }

+ 16 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementInfoMapper.xml

@@ -53,11 +53,25 @@
             <if test="endTime !=null and endTime != ''">
                 AND create_time &lt;= #{endTime}
             </if>
+        </where>
+    </select>
 
+    <!-- 修改财务结算账户状态 -->
+    <update id="updSettlementStatusById">
+        UPDATE ctop_cwjs_settlement_info
+            SET STATUS = #{status}
+        WHERE
+            id = #{id}
+    </update>
 
-        </where>
 
-    </select>
+    <!-- 删除财务结算账户 -->
+    <update id="deleteSettlementById">
+        UPDATE ctop_cwjs_settlement_info
+            SET del_flag = 1
+        WHERE
+            id = #{id}
+    </update>
 
 
 </mapper>

+ 4 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/ISettlementInfoService.java

@@ -10,4 +10,8 @@ public interface ISettlementInfoService extends IService<ctopCwjsSettlementInfo>
 
     Result getSettlementList(ctopCwjsSettlementInfo settlementInfo, Integer pageNo, Integer pageSize);
 
+    Result updSettlementStatusById(Long id,Integer status);
+
+    Result deleteSettlementById(Long id);
+
 }

+ 21 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java

@@ -33,10 +33,28 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
      */
     @Override
     public Result getSettlementList(ctopCwjsSettlementInfo settlementInfo, Integer pageNo, Integer pageSize) {
-
-        PageHelper.startPage(pageNo,pageSize);
+        PageHelper.startPage(pageNo, pageSize);
         List<ctopCwjsSettlementInfo> list = settlementInfoMapper.getSettlementList(settlementInfo);
         PageInfo<ctopCwjsSettlementInfo> pageInfo = new PageInfo<>(list);
-        return Result.successMsg("chenggong.",pageInfo);
+        return Result.successMsg("财务结算-账户列表查询成功。", pageInfo);
+    }
+
+    /**
+     * @description: 财务结算-修改账户状态
+     * @param id
+     * @param status 账户状态 0-开 1-关
+     * @return: org.jeecg.common.api.vo.Result
+     * @author: zianY
+     */
+    @Override
+    public Result updSettlementStatusById(Long id, Integer status) {
+        settlementInfoMapper.updSettlementStatusById(id,status);
+        return Result.successMsg("财务结算-修改账户状态成功。.", null);
+    }
+
+    @Override
+    public Result deleteSettlementById(Long id) {
+        settlementInfoMapper.deleteSettlementById(id);
+        return Result.successMsg("财务结算-删除成功。.", null);
     }
 }