增加营收修改

sms_water/src/main/java/com/huaxu/controller/RevenueController.java

@@ -133,6 +133,10 @@ public class RevenueController {
     public AjaxMessage<Integer> addRevenue(
             @ApiParam(value = "营收数据", required = true) @RequestBody MonthRevenueDto monthRevenueDto) {
         try{
+            //判断该机构是否有该月的数据
+            if(revenueService.isExistMonthRevenue(monthRevenueDto.getCompanyOrgId(),monthRevenueDto.getCollectDateString())>0){
+                return new AjaxMessage<>(ResultStatus.EXIST_IS_REVENUE_ERROR);
+            }
             LoginUser loginUser = UserUtil.getCurrentUser();
             //插入营收数据
             monthRevenueDto.setCreateBy(loginUser.getUsername());
@@ -297,7 +301,7 @@ public class RevenueController {
         for(MonthRevenueDto item : result){
             List<String> datalist=new ArrayList<>();
             datalist.add(String.valueOf(no++));
-            datalist.add(item.getCollectDateString());
+            datalist.add(item.getCollectDateString().replace("-","年")+"月");
             datalist.add(String.valueOf(item.getMeterReadingUsage()));
             for(WaterPropertyEntity water :waterPropertyList){
                 List<MonthSellwaterEntity> sellWaterList = item.getMonthSellList().stream().filter((MonthSellwaterEntity m)

sms_water/src/main/java/com/huaxu/dao/RevenueMapper.java

@@ -113,5 +113,11 @@ public interface RevenueMapper {
      * @return
      */
     List<MonthRevenueDto> selectList(MonthRevenueDto monthRevenueDto);
-
+    /**
+     * 查询某月是否有营收数据
+     * @param companyOrgId 机构id
+     * @param collectDateString 时间
+     * @return
+     */
+    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString);
 }

sms_water/src/main/java/com/huaxu/service/RevenueService.java

@@ -117,4 +117,12 @@ public interface RevenueService {
      * @return
      */
     List<MonthRevenueDto> selectList(MonthRevenueDto monthRevenueDto);
+
+    /**
+     * 查询某月是否有营收数据
+     * @param companyOrgId 机构id
+     * @param collectDateString 时间
+     * @return
+     */
+    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString);
 }

sms_water/src/main/java/com/huaxu/service/impl/RevenueServiceImpl.java

@@ -292,4 +292,12 @@ public class RevenueServiceImpl implements RevenueService, InitializingBean {
     public List<MonthRevenueDto> selectList(MonthRevenueDto monthRevenueDto){
         return revenueMapper.selectList(monthRevenueDto);
     }
+    /**
+     * 查询某月是否有营收数据
+     * @return
+     */
+    @Override
+    public  Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString) {
+        return revenueMapper.isExistMonthRevenue(companyOrgId,collectDateString);
+    }
 }

sms_water/src/main/resources/mapper/RevenueMapper.xml

@@ -323,4 +323,11 @@
             and t1.collect_date  < concat(#{endDate}, '-1') + interval 1 month
         order by t1.collect_date
     </select>
+    <!--查询某月是否有营收数据-->
+    <select id="isExistMonthRevenue" resultType="java.lang.Integer">
+        select count(1)
+        from  sms_month_revenue t1
+        where date_format(t1.collect_date, '%Y-%m' ) = #{collectDateString}
+            and t1.company_org_Id=#{companyOrgId}
+    </select>
 </mapper>