营收修改月份

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -123,7 +123,7 @@ public enum ResultStatus {
     SCENE_NAME_ALREADY_EXISTS(900015,"场景名称重复"),
     SCENE_PARENT_ALREADY_EXISTS(900016,"上级场景不能选择当前编辑场景"),
     DEVICE_PARENT_ALREADY_EXISTS(900017,"未选择任何设备或标签信息"),
-    EXIST_IS_REVENUE_ERROR(800004,"该公司存在该月营收数据不能新增"),
+    EXIST_IS_REVENUE_ERROR(800004,"该公司存在该月营收数据不能保存"),
 
     // 用户授权统一认证
     USER_AUTH_APPID_NOT_FOUND(910001,"appId不存在"),

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

@@ -134,7 +134,7 @@ public class RevenueController {
             @ApiParam(value = "营收数据", required = true) @RequestBody MonthRevenueDto monthRevenueDto) {
         try{
             //判断该机构是否有该月的数据
-            if(revenueService.isExistMonthRevenue(monthRevenueDto.getCompanyOrgId(),monthRevenueDto.getCollectDateString())>0){
+            if(revenueService.isExistMonthRevenue(monthRevenueDto.getCompanyOrgId(),monthRevenueDto.getCollectDateString(),null)>0){
                 return new AjaxMessage<>(ResultStatus.EXIST_IS_REVENUE_ERROR);
             }
             LoginUser loginUser = UserUtil.getCurrentUser();
@@ -172,9 +172,15 @@ public class RevenueController {
     public AjaxMessage<Integer> updateRevenue(
             @ApiParam(value = "营收数据", required = true) @RequestBody MonthRevenueDto monthRevenueDto) {
         try{
+            //判断该机构是否有该月的数据
+            if(revenueService.isExistMonthRevenue(monthRevenueDto.getCompanyOrgId(),monthRevenueDto.getCollectDateString(),monthRevenueDto.getId())>0){
+                return new AjaxMessage<>(ResultStatus.EXIST_IS_REVENUE_ERROR);
+            }
             LoginUser loginUser = UserUtil.getCurrentUser();
             //修改营收数据
             monthRevenueDto.setUpdateBy(loginUser.getUsername());
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+            monthRevenueDto.setCollectDate(sdf.parse(monthRevenueDto.getCollectDateString()));
             oneConvertWan(monthRevenueDto);
             revenueService.updateRevenue(monthRevenueDto);
             //修改售水数据
@@ -187,7 +193,6 @@ public class RevenueController {
                     entity.setTenantId(loginUser.getTenantId());
                     entity.setCreateBy(loginUser.getUsername());
                     entity.setCompanyOrgId(monthRevenueDto.getCompanyOrgId());
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
                     entity.setCollectDate(sdf.parse(monthRevenueDto.getCollectDateString()));
                     revenueService.insertSellWater(entity);
                 }else{

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

@@ -117,7 +117,8 @@ public interface RevenueMapper {
      * 查询某月是否有营收数据
      * @param companyOrgId 机构id
      * @param collectDateString 时间
+     * @param id 主键
      * @return
      */
-    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString);
+    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString,Integer id);
 }

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

@@ -122,7 +122,8 @@ public interface RevenueService {
      * 查询某月是否有营收数据
      * @param companyOrgId 机构id
      * @param collectDateString 时间
+　　　* @param id 主键
      * @return
      */
-    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString);
+    Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString,Integer id);
 }

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

@@ -297,7 +297,7 @@ public class RevenueServiceImpl implements RevenueService, InitializingBean {
      * @return
      */
     @Override
-    public  Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString) {
-        return revenueMapper.isExistMonthRevenue(companyOrgId,collectDateString);
+    public  Integer isExistMonthRevenue(Integer companyOrgId,String collectDateString,Integer id) {
+        return revenueMapper.isExistMonthRevenue(companyOrgId,collectDateString,id);
     }
 }

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

@@ -330,5 +330,8 @@
         from  sms_month_revenue t1
         where date_format(t1.collect_date, '%Y-%m' ) = #{collectDateString}
             and t1.company_org_Id=#{companyOrgId}
+            <if test="id != null">
+                and id != #{id}
+            </if>
     </select>
 </mapper>