Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
91298926a9
5 changed files with 47 additions and 1 deletions
  1. +36
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml

+ 36
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java View File

@@ -787,7 +787,7 @@ public class WxFinanceController extends BaseController {
})
public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns("period desc");
record.setSortColumns("end_date desc");
PageInfo<WxFinanceCheckOut> page = wxFinanceService.checkOutListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}
@@ -796,6 +796,41 @@ public class WxFinanceController extends BaseController {
@PostMapping("saveCheckOut")
public ResultData saveCheckOut(@RequestBody WxFinanceCheckOut record) {
record.updateTenantInfo(getTenantInfo());
//是否已经存在年月,或者开始时间,结束时间的
if (StringUtils.isBlank(record.getPeroid())) {
return new ResultData(Result.ERROR,"请选择年月");
}
if (null == record.getStartDate()) {
return new ResultData(Result.ERROR,"请选择开始日期");
}
if (null == record.getEndDate()) {
return new ResultData(Result.ERROR,"请选择结束日期");
}
WxFinanceCheckOut periodFindq = new WxFinanceCheckOut();
periodFindq.updateTenantInfo(record);
periodFindq.setPeroid(record.getPeroid());
List<WxFinanceCheckOut> list = wxFinanceService.getCheckOutList(periodFindq);
if (null != list && list.size() > 0 ) {
return new ResultData(Result.ERROR,"已存在改年月的结账记录");
}
//校验收款单是否都已审核
WxFinanceReceive frq = new WxFinanceReceive();
frq.updateTenantInfo(record);
frq.setReceiveDateBegin(record.getStartDate());
frq.setReceiveDateEnd(record.getEndDate());
List<Integer> statusList = new ArrayList<Integer>();
statusList.add(EnumFinanceReceiveStatus.NORMAL.getCode());
statusList.add(EnumFinanceReceiveStatus.RED_SETOFF.getCode());
statusList.add(EnumFinanceReceiveStatus.AUDITING.getCode());
statusList.add(EnumFinanceReceiveStatus.AUDITING_REJECT.getCode());
frq.setStatusList(statusList);
frq.setIsFinish(EnumYesOrNo.NO.getCode());
List<WxFinanceReceive> relist = wxFinanceService.findReceiveList(frq);
if (null != relist && relist.size() > 0 ) {
return new ResultData(Result.ERROR,"存在未审核的单据");
}
wxFinanceService.saveOrUpdateCheckOut(record, getUser());
return new ResultData();
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceCheckOut.java View File

@@ -49,6 +49,8 @@ public class WxFinanceCheckOut extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="所属年月",name="peroid")
private String peroid;
@TableField(exist = false)
private String peroidEqual;
@io.swagger.annotations.ApiModelProperty(value = "交款开始日期", name = "startDate")
private Date startDate;


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxFinanceService.java View File

@@ -93,4 +93,5 @@ public interface WxFinanceService {
PageInfo<WxFinanceCheckOut> checkOutListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize);
void saveOrUpdateCheckOut(WxFinanceCheckOut record,MallUserInfo user);
void deleteCheckOut(WxFinanceCheckOut record);
List<WxFinanceCheckOut> getCheckOutList(WxFinanceCheckOut record);
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java View File

@@ -1966,6 +1966,11 @@ public class WxFinanceServiceImpl implements WxFinanceService {
wxFinanceCheckOutMapper.deleteByConditon(record);;
}

@Override
public List<WxFinanceCheckOut> getCheckOutList(WxFinanceCheckOut record) {
return wxFinanceCheckOutMapper.findList(record);
}



}

+ 3
- 0
mallinkService/src/main/resources/mapper/WxFinanceCheckOutMapper.xml View File

@@ -36,6 +36,9 @@
<if test=" null != peroid and '' != peroid">
and peroid concat('%', #{peroid},'%')
</if>
<if test=" null != peroidEqual and '' != peroidEqual">
and peroid = #{peroidEqual}
</if>
<if test=" null != createBy ">and `create_by` = #{createBy}</if>
<if test=" null != startDate ">and `start_date` &gt;= #{startDate}</if>
<if test=" null != endDate ">and `end_date` &lt;= #{endDate}</if>


Loading…
Cancel
Save