From 424cfc4350d0c382108202d6f783cb556decc9cb Mon Sep 17 00:00:00 2001 From: yulin <240160934@qq.com> Date: Thu, 11 Jan 2024 15:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/partyDataFill/PartyDataFillHandler.java | 25 ++++++-- .../main/resources/config/application-online.yaml | 70 ++++++++++++++++++++ .../main/resources/config/application-test.yaml | 70 ++++++++++++++++++++ mztb/src/main/resources/config/logback-dev.xml | 74 ++++++++++++++++++++++ mztb/src/main/resources/config/logback-online.xml | 74 ++++++++++++++++++++++ mztb/src/main/resources/config/logback-test.xml | 74 ++++++++++++++++++++++ .../mztb/base/partyDataFill/partyDataFillCard.js | 17 ++--- 7 files changed, 386 insertions(+), 18 deletions(-) create mode 100644 mztb/src/main/resources/config/application-online.yaml create mode 100644 mztb/src/main/resources/config/application-test.yaml create mode 100644 mztb/src/main/resources/config/logback-dev.xml create mode 100644 mztb/src/main/resources/config/logback-online.xml create mode 100644 mztb/src/main/resources/config/logback-test.xml diff --git a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java index bc093d6..a95088d 100644 --- a/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java +++ b/mztb/src/main/java/cc/smtweb/biz/mztb/web/base/partyDataFill/PartyDataFillHandler.java @@ -15,18 +15,19 @@ import cc.smtweb.system.bpm.web.engine.model.listcard.lcms.LCMsSaveHandler; import cc.smtweb.system.bpm.web.sys.user.user.UserCache; import java.util.List; +import java.util.Map; public class PartyDataFillHandler { protected static FinanceInfo financeInfo; protected static YearEndPersons yearEndPersons; protected static BusinessInfo businessInfo; - protected static PartyInfo partyInfo; +// protected static PartyInfo partyInfo; protected static final String YEAR_END_PERSONS_DS_NAME = "yearEndPersonsForm"; protected static final String FINANCE_DS_NAME = "financeForm"; protected static final String BUSINESS_DS_NAME = "businessForm"; - protected static final String PARTY_DS_NAME = "partyForm"; +// protected static final String PARTY_DS_NAME = "partyForm"; static class PartyDataFillModelSaveHandler extends LCMsSaveHandler { @Override @@ -37,7 +38,7 @@ public class PartyDataFillHandler { } financeInfo = readBeanFromPage(FINANCE_DS_NAME, pageData, filter); businessInfo = readBeanFromPage(BUSINESS_DS_NAME, pageData, filter); - partyInfo = readBeanFromPage(PARTY_DS_NAME, pageData, filter); +// partyInfo = readBeanFromPage(PARTY_DS_NAME, pageData, filter); } @Override @@ -48,7 +49,7 @@ public class PartyDataFillHandler { } saveBean(financeInfo); saveBean(businessInfo); - saveBean(partyInfo); +// saveBean(partyInfo); } } @@ -90,9 +91,21 @@ public class PartyDataFillHandler { super.localAdd(); bean.setDate(DateUtil.nowDateLong()); bean.setPartyId(params.readLong("CUR_PARTY_ID")); -// bean.setUser(UserCache.getInstance().getNameById(us.getUserId())); -// bean.setUpdateAt(DateUtil.nowDateLong()); + bean.setUser(UserCache.getInstance().getNameById(us.getUserId())); DbEngine instance = DbEngine.getInstance(); + // 将机构表数据同步到填报主表机构信息中 + PartyInfo partyInfo = instance.queryEntity(PartyInfo.class, params.readLong("CUR_PARTY_ID")); + SwMap partyInfoData = partyInfo.getData(); + partyInfoData.remove("pi_update_at"); + partyInfoData.remove("pi_sys_party_id"); + partyInfoData.remove("_def_table_name"); + SwMap partyInfoFillOutData = new SwMap(); + // 处理字段 + for (Map.Entry entry : partyInfoData.entrySet()) { + partyInfoFillOutData.put("fo_"+entry.getKey(),partyInfoData.readString(entry.getKey())); + } + bean.getData().putAll(partyInfoFillOutData); + // bean.setUser(us.getUserId()); if(params.readString("outOldData").equals("1")) { // 如果带出上期数据,并且能找到最近的数据 就不执行初始化 // 通过填报类型 找到当前机构最近填报的一条数据， diff --git a/mztb/src/main/resources/config/application-online.yaml b/mztb/src/main/resources/config/application-online.yaml new file mode 100644 index 0000000..7fefeb7 --- /dev/null +++ b/mztb/src/main/resources/config/application-online.yaml @@ -0,0 +1,70 @@ +smtweb: + machine-id: 1 + enable-job: true + file: + #此配置用于系统底层附件上传方法配置，适用于本机上传，必须files/结尾 + local-path: /jujia_git/files/ + # url: ${smtweb.file.host}:${server.port}${server.servlet.context-path}/${smtweb.file.local-path} + url: 'http://127.0.0.1:8888/files/' + + #访问路径,需/结尾 + attach-http-path: 'http://bjjt.jujiatech.cn/files/' + #此配置原则上可以和local-path一致，可本机路径可ftp附件路径,需/结尾 + attach-path: /jujia_git/files/ + #临时文件路径,需/结尾 + attach-temp-path: /jujia_git/tempFile/ + #附件上传方式 sftp/ftp/local + attach-type: local + #ftp IP地址 + attach-ftp-ip: + #ftp 端口 + attach-ftp-port: 0 + #ftp 用户名 + attach-ftp-user: + #ftp 密码 + attach-ftp-pwd: + bpm: + debug: true + code-java-path: 'G:\jjkj\java\lrjx' + mode: 1 + db: + type: mysql + # 人大金仓 + #type: kbsql + schema: public + default: + rule: + prefix: _smt_ + replace: smt_ + +server: + port: 8236 + servlet: + context-path: /mztb +logging: + level: + root: INFO + cc.smtweb: DEBUG +spring: + redis: + host: 127.0.0.1 + port: 6379 + password: + database: 0 + datasource: + # 生产 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.110.210:4418/mztb?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + username: root + password: Ncmz@2022_jjkj + servlet: + multipart: + max-file-size: 104857600000 + max-request-size: 10485760000000 + cache: + type: caffeine + cache-names: + - core + - bpm + caffeine: + spec: maximumSize=1024,expireAfterWrite=2h diff --git a/mztb/src/main/resources/config/application-test.yaml b/mztb/src/main/resources/config/application-test.yaml new file mode 100644 index 0000000..0074b5c --- /dev/null +++ b/mztb/src/main/resources/config/application-test.yaml @@ -0,0 +1,70 @@ +smtweb: + machine-id: 1 + enable-job: true + file: + #此配置用于系统底层附件上传方法配置，适用于本机上传，必须files/结尾 + local-path: /jujia_git/files/ + # url: ${smtweb.file.host}:${server.port}${server.servlet.context-path}/${smtweb.file.local-path} + url: 'http://127.0.0.1:8888/files/' + + #访问路径,需/结尾 + attach-http-path: 'http://bjjt.jujiatech.cn/files/' + #此配置原则上可以和local-path一致，可本机路径可ftp附件路径,需/结尾 + attach-path: /jujia_git/files/ + #临时文件路径,需/结尾 + attach-temp-path: /jujia_git/tempFile/ + #附件上传方式 sftp/ftp/local + attach-type: local + #ftp IP地址 + attach-ftp-ip: + #ftp 端口 + attach-ftp-port: 0 + #ftp 用户名 + attach-ftp-user: + #ftp 密码 + attach-ftp-pwd: + bpm: + debug: true + code-java-path: 'G:\jjkj\java\lrjx' + mode: 1 + db: + type: mysql + # 人大金仓 + #type: kbsql + schema: public + default: + rule: + prefix: _smt_ + replace: smt_ + +server: + port: 8552 + servlet: + context-path: /mztbcs +logging: + level: + root: INFO + cc.smtweb: DEBUG +spring: + redis: + host: 127.0.0.1 + port: 6379 + password: + database: 0 + datasource: + # 测试 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.110.210:4418/mztb?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + username: root + password: Ncmz@2022_jjkj + servlet: + multipart: + max-file-size: 104857600000 + max-request-size: 10485760000000 + cache: + type: caffeine + cache-names: + - core + - bpm + caffeine: + spec: maximumSize=1024,expireAfterWrite=2h diff --git a/mztb/src/main/resources/config/logback-dev.xml b/mztb/src/main/resources/config/logback-dev.xml new file mode 100644 index 0000000..53f5d37 --- /dev/null +++ b/mztb/src/main/resources/config/logback-dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + ${FILE_LOG_PATTERN} + ${FILE_LOG_CHARSET} + + ${LOG_FILE_ERROR} + + ${LOG_PATH}/smt.%d{yyyy-MM-dd}.%i.error.log.zip + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-1GB} + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-50GB} + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + ERROR + ACCEPT + DENY + + + + + + localhost + 21022 + 10000 + + + + + + + com.mysql.cj.jdbc.Driver + jdbc:mysql://192.168.110.210:4418/lrjx?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + root + Ncmz@2022_jjkj + + + + + + + + + + + + + + + + + + + + diff --git a/mztb/src/main/resources/config/logback-online.xml b/mztb/src/main/resources/config/logback-online.xml new file mode 100644 index 0000000..82efb29 --- /dev/null +++ b/mztb/src/main/resources/config/logback-online.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + ${FILE_LOG_PATTERN} + ${FILE_LOG_CHARSET} + + ${LOG_FILE_ERROR} + + ${LOG_PATH}/smt.%d{yyyy-MM-dd}.%i.error.log.zip + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-1GB} + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-50GB} + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + ERROR + ACCEPT + DENY + + + + + + localhost + 21022 + 10000 + + + + + + + com.mysql.cj.jdbc.Driver + jdbc:mysql://192.168.110.210:4418/mztb?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + root + Ncmz@2022_jjkj + + + + + + + + + + + + + + + + + + + + diff --git a/mztb/src/main/resources/config/logback-test.xml b/mztb/src/main/resources/config/logback-test.xml new file mode 100644 index 0000000..82efb29 --- /dev/null +++ b/mztb/src/main/resources/config/logback-test.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + ${FILE_LOG_PATTERN} + ${FILE_LOG_CHARSET} + + ${LOG_FILE_ERROR} + + ${LOG_PATH}/smt.%d{yyyy-MM-dd}.%i.error.log.zip + ${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false} + ${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-1GB} + ${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-50GB} + ${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30} + + + + ERROR + ACCEPT + DENY + + + + + + localhost + 21022 + 10000 + + + + + + + com.mysql.cj.jdbc.Driver + jdbc:mysql://192.168.110.210:4418/mztb?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false + root + Ncmz@2022_jjkj + + + + + + + + + + + + + + + + + + + + diff --git a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillCard.js b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillCard.js index 1935511..821def1 100644 --- a/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillCard.js +++ b/mztb/src/main/resources/static/event/mztb/base/partyDataFill/partyDataFillCard.js @@ -18,7 +18,8 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillCard", { $model.card.setFormVal("fo_task", Number($params.type) === 2 ? Number($params.task + "99") : Number($params.task)) //如果是年报 年份后面添加标识 99 $model.card.setFormVal("fo_task_text", $params.task_text) } - $api.loadOne("partyForm") + withRegisterDeptTypeDisable($model.card.getFormVal("fo_pi_reg_dept")); + // $api.loadOne("partyForm") if (Number($model.card.getFormVal("fo_state") === 2) || Number($model.card.getFormVal("fo_state") === 1)) { $refs.saveButton.hide() } @@ -27,14 +28,6 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillCard", { } } - $lifecycle.onLoadOne = (dataSet) => { - // 加载机构后 通过不同的登记部门 对字段进行禁用处理 - if (dataSet === "partyForm") { - // 不同登记部门 可填写字段不同 - withRegisterDeptTypeDisable($model.partyForm.getFormVal("pi_reg_dept")); - } - } - // 聚合数据集操作 Object.assign($engine, { buildSaveParams(params) {// 将需要保存的数据集 构建到参数里面 @@ -49,9 +42,9 @@ window.$swEvent.setup("mztb.base.partyDataFill.partyDataFillCard", { params.businessForm = { form: $model.businessForm.data.form } - params.partyForm = { - form: $model.partyForm.data.form - } + // params.partyForm = { + // form: $model.partyForm.data.form + // } } })