diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java index 40ee61b..6516868 100644 --- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java +++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataCustomHandler.java @@ -44,9 +44,11 @@ public class PartyDataCustomHandler extends AbstractHandler { public R checkRepetition(SwMap params, UserSession us) { DbEngine instance = DbEngine.getInstance(); + String task = params.readString("task"); + if(task.length() == 4) task+="99"; Integer cur_party_id = instance.queryInt("select count(*) from "+EntityHelper.getSchemaTableName(FillOut.ENTITY_NAME) +" where fo_party_id = ? and fo_state != -1 and fo_task = ?" - , us.getPartyId(),params.readLong("task")); + , us.getPartyId(),task); if(cur_party_id != 0) { return R.error("当前机构已有该任务的填报数据:"+params.readString("task_text")); } diff --git a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js index 174fe7a..7a7a4a7 100644 --- a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js +++ b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillList.js @@ -49,6 +49,10 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillList", { $model.ds_1.data.form.task = undefined $model.ds_1.data.form.task_text = '' } + const clearValue = () => { + $model.ds_1.data.form.task = undefined + $model.ds_1.data.form.task_text = '' + } const setTypeDef =()=> { $model.ds_1.data.form.month = 1 @@ -96,7 +100,7 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillList", { return { demoFunc,setValue,toPageEdit,selectHide,setTypeDef,edit_del_affirm_Hide,affirm_push_CancelHide - ,logicDel,affirm,cancelAffirm,pushData + ,logicDel,affirm,cancelAffirm,pushData,clearValue } } });