diff --git a/resource/WEB-INF/CBS2ECConfig.xml b/resource/WEB-INF/CBS2ECConfig.xml new file mode 100644 index 000000000..e6bde94e6 --- /dev/null +++ b/resource/WEB-INF/CBS2ECConfig.xml @@ -0,0 +1,36 @@ + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + + + +
+ + + diff --git a/resource/WEB-INF/prop/hrmSalaryCBS8.properties b/resource/WEB-INF/prop/hrmSalaryCBS8.properties new file mode 100644 index 000000000..020729963 --- /dev/null +++ b/resource/WEB-INF/prop/hrmSalaryCBS8.properties @@ -0,0 +1,12 @@ +# ??ID +app_id=Yg8fWSvs +# ???? +app_secret=1f23768c02219d7864b0009c30a1b6a59fe84606 +# ???? +bodyEncryptionKey=0467E11F7CA86D884C990D4F3F5C2A1EFEEBB02B9878F4FDDCB7899DFABADCC8F38FC23F007A8AF9B2EB8A1D313959647CD8A1542F0414116AE6CFCA792346A802 +# ???????? +signEncryptionPrivateKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247 +# ???????? +bodyDecryptionKey=135d6d61d5e820a979e58f4939abbd528c82528c8c276852445854377e1df247 +# ???? +host=https://cbs8-openapi-reprd.csuat.cmburl.cn \ No newline at end of file diff --git a/src/com/engine/salary/biz/SIAccountBiz.java b/src/com/engine/salary/biz/SIAccountBiz.java index 9b2bbb180..56a1ce4b8 100644 --- a/src/com/engine/salary/biz/SIAccountBiz.java +++ b/src/com/engine/salary/biz/SIAccountBiz.java @@ -439,11 +439,11 @@ public class SIAccountBiz extends Service { public List listCanPayEmpIds(Long paymentOrganization, String billMonth) { List listCanPayEmpIds = new ArrayList<>(); //绀句繚妗ｆ涓彲杩涜缂寸撼鐨勪汉鍛 - List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List socialCanPayEmpIds = getSocialSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //鍏Н閲戞。妗堜腑鍙繘琛岀即绾崇殑浜哄憳 - List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List fundCanPayEmpIds = getFundSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); //鍏朵粬绂忓埄妗ｆ涓彲杩涜缂寸撼鐨勪汉鍛 - List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth); + List otherCanPayEmpIds = getOtherSchemeMapper().listCanPayEmpIds(paymentOrganization, billMonth, 0); if (socialCanPayEmpIds != null && socialCanPayEmpIds.size() > 0) { listCanPayEmpIds.addAll(socialCanPayEmpIds); } diff --git a/src/com/engine/salary/entity/datacollection/param/OtherDeductionDetailDeleteParam.java b/src/com/engine/salary/entity/datacollection/param/OtherDeductionDetailDeleteParam.java index 447c04b87..c97a0b9a7 100644 --- a/src/com/engine/salary/entity/datacollection/param/OtherDeductionDetailDeleteParam.java +++ b/src/com/engine/salary/entity/datacollection/param/OtherDeductionDetailDeleteParam.java @@ -23,4 +23,6 @@ public class OtherDeductionDetailDeleteParam { // 涓婚敭id private List ids; + + private Long mainId; } diff --git a/src/com/engine/salary/mapper/SQLMapper.java b/src/com/engine/salary/mapper/SQLMapper.java index 9afff661a..c3a7f8167 100644 --- a/src/com/engine/salary/mapper/SQLMapper.java +++ b/src/com/engine/salary/mapper/SQLMapper.java @@ -17,4 +17,6 @@ public interface SQLMapper { List runSQL(@Param("sql") String sql); List listLong(@Param("sql") String sql); + + List listString(@Param("sql") String sql); } diff --git a/src/com/engine/salary/mapper/SQLMapper.xml b/src/com/engine/salary/mapper/SQLMapper.xml index b487b3f53..3f67dea38 100644 --- a/src/com/engine/salary/mapper/SQLMapper.xml +++ b/src/com/engine/salary/mapper/SQLMapper.xml @@ -9,4 +9,8 @@ + + diff --git a/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.java b/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.java new file mode 100644 index 000000000..cfe5e56a6 --- /dev/null +++ b/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.java @@ -0,0 +1,57 @@ +package com.engine.salary.mapper.cbs; + +import com.engine.salary.remote.cbs8.po.UfHkrdzbPO; + +import java.util.List; + +public interface UfHkrdzbMapper { + + /** + * 鏌ヨ鎵鏈夎褰 + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listAll(); + + /** + * 鏉′欢鏌ヨ + * + * @return 杩斿洖闆嗗悎锛屾病鏈夎繑鍥炵┖List + */ + List listSome(UfHkrdzbPO ufHkrdzb); + + + /** + * 鏍规嵁涓婚敭鏌ヨ + * + * @param id 涓婚敭 + * @return 杩斿洖璁板綍锛屾病鏈夎繑鍥瀗ull + */ + UfHkrdzbPO getById(Integer id); + + /** + * 鏂板锛屽拷鐣ull瀛楁 + * + * @param ufHkrdzb 鏂板鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int insertIgnoreNull(UfHkrdzbPO ufHkrdzb); + + /** + * 淇敼锛屼慨鏀规墍鏈夊瓧娈 + * + * @param ufHkrdzb 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int update(UfHkrdzbPO ufHkrdzb); + + /** + * 淇敼锛屽拷鐣ull瀛楁 + * + * @param ufHkrdzb 淇敼鐨勮褰 + * @return 杩斿洖褰卞搷琛屾暟 + */ + int updateIgnoreNull(UfHkrdzbPO ufHkrdzb); + + +} \ No newline at end of file diff --git a/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.xml b/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.xml new file mode 100644 index 000000000..7380ec2c5 --- /dev/null +++ b/src/com/engine/salary/mapper/cbs/UfHkrdzbMapper.xml @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + t + . + id + , t.requestId + , t.formmodeid + , t.modedatacreater + , t.modedatacreatertype + , t.modedatacreatedate + , t.modedatacreatetime + , t.MODEUUID + , t.form_biz_id + , t.gsbm + , t.khbm + , t.khmc + , t.bmbm + , t.bmd + , t.bm + , t.modedatamodifier + , t.modedatamodifydatetime + + + + + + + + + + + + + + + INSERT INTO uf_hkrdzb + + + + requestId, + + + formmodeid, + + + modedatacreater, + + + modedatacreatertype, + + + modedatacreatedate, + + + modedatacreatetime, + + + MODEUUID, + + + form_biz_id, + + + gsbm, + + + khbm, + + + khmc, + + + bmbm, + + + bmd, + + + bm, + + + modedatamodifier, + + + modedatamodifydatetime, + + + + + #{requestId}, + + + #{formmodeid}, + + + #{modedatacreater}, + + + #{modedatacreatertype}, + + + #{modedatacreatedate}, + + + #{modedatacreatetime}, + + + #{modeuuid}, + + + #{formBizId}, + + + #{gsbm}, + + + #{khbm}, + + + #{khmc}, + + + #{bmbm}, + + + #{bmd}, + + + #{bm}, + + + #{modedatamodifier}, + + + #{modedatamodifydatetime}, + + + + + + + + + UPDATE uf_hkrdzb + + requestId=#{requestId}, + formmodeid=#{formmodeid}, + modedatacreater=#{modedatacreater}, + modedatacreatertype=#{modedatacreatertype}, + modedatacreatedate=#{modedatacreatedate}, + modedatacreatetime=#{modedatacreatetime}, + MODEUUID=#{modeuuid}, + form_biz_id=#{formBizId}, + gsbm=#{gsbm}, + khbm=#{khbm}, + khmc=#{khmc}, + bmbm=#{bmbm}, + bmd=#{bmd}, + bm=#{bm}, + modedatamodifier=#{modedatamodifier}, + modedatamodifydatetime=#{modedatamodifydatetime}, + + WHERE id = #{id} + + + + + + UPDATE uf_hkrdzb + + + requestId=#{requestId}, + + + formmodeid=#{formmodeid}, + + + modedatacreater=#{modedatacreater}, + + + modedatacreatertype=#{modedatacreatertype}, + + + modedatacreatedate=#{modedatacreatedate}, + + + modedatacreatetime=#{modedatacreatetime}, + + + MODEUUID=#{modeuuid}, + + + form_biz_id=#{formBizId}, + + + gsbm=#{gsbm}, + + + khbm=#{khbm}, + + + khmc=#{khmc}, + + + bmbm=#{bmbm}, + + + bmd=#{bmd}, + + + bm=#{bm}, + + + modedatamodifier=#{modedatamodifier}, + + + modedatamodifydatetime=#{modedatamodifydatetime}, + + + WHERE id = #{id} + + + + + + \ No newline at end of file diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java index 75fbefcaa..7a470a222 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.java @@ -28,6 +28,8 @@ public interface SIAccountDetailTempMapper { */ void batchDelByEmpIdsAndMonthAndPayOrg(@Param("employeeIds") Collection employeeIds, @Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + void batchDelByMonthAndPayOrg(@Param("billMonth") String billMonth, @Param("paymentOrganization") Long paymentOrganization); + /** * 鎵归噺淇濆瓨 * @param accounts diff --git a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml index ca12fe478..a5fa46fca 100644 --- a/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/SIAccountDetailTempMapper.xml @@ -139,6 +139,14 @@ + + UPDATE hrsa_bill_detail_temp + SET delete_type = 1 + WHERE delete_type = 0 + AND bill_month = #{billMonth} + AND payment_organization = #{paymentOrganization} + + INSERT INTO hrsa_bill_detail_temp diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java index c7dfa1233..07396a02b 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.java @@ -67,7 +67,7 @@ public interface FundSchemeMapper { * @param paymentOrganization * @return */ - List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth); + List listCanPayEmpIds(@Param("paymentOrganization")Long paymentOrganization, @Param("billMonth")String billMonth, @Param("nonPayment") Integer nonPayment); List listAll(); diff --git a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml index 644a21d18..8cb8fc4e0 100644 --- a/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/FundSchemeMapper.xml @@ -266,6 +266,7 @@ AND fund_scheme_id is not null AND fund_start_time is not null AND fund_start_time #{billMonth} AND (fund_end_time is null OR fund_end_time = ]]> #{billMonth} OR fund_end_time ='') + AND non_payment = #{nonPayment}