md
This commit is contained in:
linfso
parent
04b28cd551
commit
cd3e6d4b2b
@ -274,4 +274,148 @@ public class EmisSettleSubBillController extends BaseController
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 站点确认账单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:confirmBillBySite')")
|
||||
@Log(title = "站点确认账单", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/confirmBillBySite/{ids}")
|
||||
public AjaxResult confirmBillBySite(@PathVariable Long[] ids)
|
||||
{
|
||||
if(ids!=null && ids.length>0){
|
||||
for(int i=0;i<ids.length;i++){
|
||||
try {
|
||||
long id=ids[i];
|
||||
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
|
||||
emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode());
|
||||
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setId(id);
|
||||
|
||||
emisBaseService.confirmBillBySite(emisSettleSubBill);
|
||||
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
// 返回子定义异常
|
||||
if(ex instanceof EmisBizError){
|
||||
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
|
||||
}
|
||||
|
||||
return AjaxResult.error("确认异常，联系客服");
|
||||
}
|
||||
}
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 站点取消确认账单
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:cancelConfirmBillBySite')")
|
||||
@Log(title = "站点取消确认账单", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/cancelConfirmBillBySite/{ids}")
|
||||
public AjaxResult cancelConfirmBillBySite(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
|
||||
{
|
||||
if(ids!=null && ids.length>0){
|
||||
for(int i=0;i<ids.length;i++){
|
||||
try {
|
||||
long id=ids[i];
|
||||
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
|
||||
emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode());
|
||||
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setSiteConfirmNote(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setId(id);
|
||||
|
||||
emisBaseService.cancelConfirmBillBySite(emisSettleSubBill);
|
||||
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
// 返回子定义异常
|
||||
if(ex instanceof EmisBizError){
|
||||
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
|
||||
}
|
||||
|
||||
return AjaxResult.error("确认异常，联系客服");
|
||||
}
|
||||
}
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 站点确认不出账
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:confirmNoBillBySite')")
|
||||
@Log(title = "站点确认不出账", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/confirmNoBillBySite/{ids}")
|
||||
public AjaxResult confirmNoBillBySite(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
|
||||
{
|
||||
if(ids!=null && ids.length>0){
|
||||
for(int i=0;i<ids.length;i++){
|
||||
try {
|
||||
long id=ids[i];
|
||||
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
|
||||
emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode());
|
||||
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setSiteConfirmNote(getLoginUser().getUser().getOwnerSiteCode());
|
||||
|
||||
emisSettleSubBill.setId(id);
|
||||
|
||||
emisBaseService.confirmNoBillBySite(emisSettleSubBill);
|
||||
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
// 返回子定义异常
|
||||
if(ex instanceof EmisBizError){
|
||||
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
|
||||
}
|
||||
|
||||
return AjaxResult.error("确认异常，联系客服");
|
||||
}
|
||||
}
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 站点设置账单异常
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:setBillErrorBySite')")
|
||||
@Log(title = "站点设置账单异常", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/setBillErrorBySite/{ids}")
|
||||
public AjaxResult setBillErrorBySite(@PathVariable Long[] ids,@RequestBody EmisSettleSubBill spr)
|
||||
{
|
||||
if(ids!=null && ids.length>0){
|
||||
for(int i=0;i<ids.length;i++){
|
||||
try {
|
||||
long id=ids[i];
|
||||
EmisSettleSubBill emisSettleSubBill = new EmisSettleSubBill();
|
||||
emisSettleSubBill.setSiteConfirmManCode(getLoginUser().getUser().getEmpCode());
|
||||
emisSettleSubBill.setConfirmSite(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setSiteConfirmNote(getLoginUser().getUser().getOwnerSiteCode());
|
||||
emisSettleSubBill.setId(id);
|
||||
|
||||
emisBaseService.setBillErrorBySite(emisSettleSubBill);
|
||||
|
||||
}catch (Exception ex){
|
||||
ex.printStackTrace();
|
||||
// 返回子定义异常
|
||||
if(ex instanceof EmisBizError){
|
||||
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
|
||||
}
|
||||
|
||||
return AjaxResult.error("确认异常，联系客服");
|
||||
}
|
||||
}
|
||||
}
|
||||
return AjaxResult.success("确认成功");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -76,6 +76,9 @@ public interface EmisSettleSubBillMapper extends BaseMapper<EmisSettleSubBill>
|
||||
public int confirmBillBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
public int cancelConfirmBillBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
|
||||
public int confirmNoBillBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
public int setBillErrorBySite(EmisSettleSubBill emisSettleSubBill);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
|
||||
@ -1004,6 +1004,45 @@ public class EmisBaseService {
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 站点业务确认
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int confirmBillBySite(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.confirmBillBySite(emisSettleSubBill);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 站点账单取消
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int cancelConfirmBillBySite(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.cancelConfirmBillBySite(emisSettleSubBill);
|
||||
}
|
||||
|
||||
/**
|
||||
* 站点确认不出账
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int confirmNoBillBySite(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.confirmNoBillBySite(emisSettleSubBill);
|
||||
}
|
||||
|
||||
/**
|
||||
* 站点置账单异常
|
||||
* @param emisSettleSubBill
|
||||
* @return
|
||||
*/
|
||||
public int setBillErrorBySite(EmisSettleSubBill emisSettleSubBill){
|
||||
return emisSettleSubBillMapper.setBillErrorBySite(emisSettleSubBill);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 短信发送
|
||||
*/
|
||||
|
||||
@ -241,7 +241,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
bl_confirm = '1',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_site = #{confirmSite},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
@ -256,7 +255,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
bl_confirm = '0',
|
||||
confirm_date = null,
|
||||
confirm_man_code =null,
|
||||
confirm_site = null,
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
@ -264,14 +262,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 中心确认不出账 3-->
|
||||
<!-- 中心确认不出账 2-->
|
||||
<update id="confirmNoBillByCenter" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '2',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_note = #{confirmNote},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 中心账单设置异常 3 -->
|
||||
<update id="setBillErrorByCenter" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '3',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_site = #{confirmSite},
|
||||
confirm_note = #{confirmNote},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
@ -280,29 +292,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 中心账单设置异常 4 -->
|
||||
<update id="setBillErrorByCenter" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '4',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_site = #{confirmSite},
|
||||
confirm_note = #{confirmNote},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 站点确认 -->
|
||||
<!-- 站点业务确认 -->
|
||||
<update id="confirmBillBySite" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_site_confirm = '1',
|
||||
site_confirm_date = now(),
|
||||
<if test="confirmManCode != null and confirmManCode != ''">confirm_man_code = #{confirmManCode},</if>
|
||||
confirm_site = #{confirmSite},
|
||||
site_confirm_man_code = #{confirmManCode},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
@ -317,6 +314,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
bl_confirm = '0',
|
||||
site_confirm_date = null,
|
||||
site_confirm_man_code =null,
|
||||
confirm_site = null,
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 站点确认不出账 2-->
|
||||
<update id="confirmNoBillBySite" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '2',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_site = #{confirmSite},
|
||||
site_confirm_note = #{siteConfirmNote},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
<!-- 站点账单设置异常 3 -->
|
||||
<update id="setBillErrorBySite" parameterType="EmisSettleSubBill">
|
||||
update emis_settle_sub_bill
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
bl_confirm = '3',
|
||||
confirm_date = now(),
|
||||
confirm_man_code = #{confirmManCode},
|
||||
confirm_site = #{confirmSite},
|
||||
site_confirm_note = #{siteConfirmNote},
|
||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
<where>
|
||||
del_flag = '0'
|
||||
<if test="id != null "> and id = #{id}</if>
|
||||
<if test="lineCode != null and lineCode != ''"> and line_code=#{lineCode}</if>
|
||||
<if test="lineCode != null and lineCode != ''"> and and FIND_IN_SET(line_code,#{lineCode})</if>
|
||||
<if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
|
||||
<if test="lineNameEn != null and lineNameEn != ''"> and line_name_en like concat('%', #{lineNameEn}, '%')</if>
|
||||
<if test="meterRate != null and meterRate != ''"> and meter_rate=#{meterRate}</if>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<where>
|
||||
del_flag='0'
|
||||
<if test="id != null "> and id = #{id}</if>
|
||||
<if test="prodCode != null and prodCode != ''"> and prod_code=#{prodCode}</if>
|
||||
<if test="prodCode != null and prodCode != ''"> and FIND_IN_SET(prod_code,#{prodCode}) </if>
|
||||
<if test="prodName != null and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>
|
||||
<if test="prodNameEn != null and prodNameEn != ''"> and prod_name_en like concat('%', #{prodNameEn}, '%')</if>
|
||||
<if test="status != null "> and status = #{status}</if>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user