1111

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/prodstock/ProdStockService.java

@@ -20,7 +20,9 @@ public class ProdStockService extends MybatisBaseService<ProdStockMapper, ProdSt
         ProdStockQuery params = pq.getParams();
         QueryWrapper<ProdStock> wq = new QueryWrapper<>();
         if (params != null){
-
+            if (params.getProName() != null && !params.getProName().equals("")){
+                wq.like("pro_name",params.getProName());
+            }
         }
         IPage<ProdStock> page = PagerUtil.queryToPage(pq);
         IPage<ProdStockVo> prodStockIPage = baseMapper.selectPageVo(page, wq);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDaily.java

@@ -43,8 +43,6 @@ public class ProjectDaily extends EntityWithId {
     private String userName; // 用户(报告人)姓名',
     private int userType = 1; // 用户(报告人)类型:1监管、2客户、3银行',
     private String userStaffSid; // 关联人员的Sid',
-    private String totalLoanA;
-
 
     /**
      * 计算出的质押率

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyMapper.java

@@ -13,9 +13,6 @@ public interface ProjectDailyMapper extends BaseMapper<ProjectDaily> {
 
     IPage<ProjectDailyVo> selectPageVo(IPage<ProjectDaily> page, @Param(Constants.WRAPPER) Wrapper<ProjectDaily> ew);
 
-    @Select("select * from project_daily where sid = #{sid}")
-    ProjectDaily selectOne(@Param("sid") String sid);
-
     @Select("select * from project_daily where projectSid = #{projectSid} and orderDate = #{orderDate}")
     ProjectDaily selectByProSidAndOrderDate(@Param("projectSid") String projectSid,@Param("orderDate") String orderDate);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyService.java

@@ -125,12 +125,4 @@ public class ProjectDailyService extends ServiceImpl<ProjectDailyMapper, Project
             }
         });
     }
-
-    public ResultBean selectProBySid(String sid){
-        ResultBean rb = ResultBean.fireFail();
-        ProjectDaily projectDaily = baseMapper.selectOne(sid);
-        BigDecimal big = new BigDecimal(projectDaily.getTotalLoan());
-        projectDaily.setTotalLoanA(big.setScale(2, 2).toString());
-        return rb.success().setData(projectDaily);
-    }
 }