From 226e5e165f5d921c0f6409bfd92ffda41d8096ea Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 14:31:45 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=A0=B9=E6=8D=AE=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93id=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 8 +++ .../ILawsTechnologyEvaluationEOService.java | 2 + ...LawsTechnologyEvaluationEOServiceImpl.java | 70 ++++++++++++++++++- 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index fb3f82b0e..5ffbd090c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -210,4 +210,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); return Result.OK(result); } + + @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") + @PostMapping(value = "/queryPageDummyById") + @ResponseBody + public Result queryPageDummyById(@RequestBody Map parameter) { + List> result = this.lawsTechnologyEvaluationEOService.queryPageDummyById(parameter); + return Result.OK(result); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index 5c4cd6ce8..a0b58fab0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -86,4 +86,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + + List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 333d1ad29..97fcc3cb4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -28,12 +28,9 @@ import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -401,6 +398,73 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> queryPageDummyById(Map parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + String id = (String) parameter.get("id"); + //文档库字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + + List fileFieldStrList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).map(OnlCgformField::getDbFieldName) + .collect(Collectors.toList()); + + List> result = this.bussDocumentLibraryEOMapper.queryListByIds(id); + + //树形数据字典 + List categoryList = this.sysCategoryService.list(); + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + //数据字典 + List sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); + //下拉选处理数据字典 + for (Map record : result) { + Map record1 = (Map) record; + String technology_territory = (String)record1.get("technology_territory"); + + List connectIdList = new ArrayList<>(); + + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); + this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + if(fileFieldStrList.contains(entry.getKey())){ + if(entry.getValue()!=null){ + connectIdList.add(entry.getValue().toString()); + } + } + } + record1.put("technology_territory_id",technology_territory); + + if(CollectionUtils.isNotEmpty(connectIdList)){ + //根据id查询当前文档库数据是否有拆分数据。 + QueryWrapper splitInfoEOQueryWrapper = new QueryWrapper<>(); + splitInfoEOQueryWrapper.lambda().in(SarFileSplitInfoEO::getConnectId,connectIdList); + List sarFileSplitInfoList = new ArrayList<>(); + + List sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper); + if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){ + sarFileSplitInfoListTemp.forEach(splitInfo -> { + //查询出已回传的数据 + String flag = ""; // 1 已回传 0未回传。 + if(StringUtils.isNotEmpty(splitInfo.getFileId())){ + flag = "1"; + sarFileSplitInfoList.add(splitInfo); + }else { + flag = "0"; + } + splitInfo.setFlag(flag); + }); + record1.put("sarFileSplitInfoList",sarFileSplitInfoList); + } + } + } + return result; + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { From 055f6c14bc91f3e2b5073fb53b3a7f57ab7dfc56 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 15:14:45 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 16 ++++++++-------- .../components/standardDecompositionSheet.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 09874fbdd..63c70236c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -347,15 +347,15 @@ id: this.formInline.standId } this.loading = true - let url = '' - if (this.isTrue) { - url = this.url.addModelListOne - } else { - url = this.url.addModelList - } - postAction(url, query).then((res) => { + // let url = '' + // if (this.isTrue) { + // url = this.url.addModelListOne + // } else { + // url = this.url.addModelList + // } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummyById', query).then((res) => { if (res.success) { - let content = res.result.records || [] + let content = res.result || [] this.selectedRowKeysRecord.push({ standId: content[0].id, serialNumber: content[0].serial_number, diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 0496bf0a7..6394fc303 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -275,7 +275,7 @@ } .title-text { - width: 33px; + width: 73px; color: #000F16; display: inline-block; font-weight: 500; From 28d9dac6c2d371f53d9d14e1ffc5fbb5ba15eb83 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 15:51:41 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/businessSupport/technologyAssessment/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 6521ae1c7..93a0137a8 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -382,6 +382,7 @@ id: row.id, processBackground: row.processBackground, serialNumber: row.serialNumber, + lawsTechnologyEvaluationId:row.id, standId: row.standId, remark:row.remark } From b87288c9d16fd21cc42dbecd965768126357436e Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 15 Jul 2022 16:18:56 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97=E8=A1=A8-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91=20=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/public/v2.js | 2 +- jero-web/src/common/lang/en-us.js | 2 +- jero-web/src/common/lang/zh-cn.js | 2 +- .../parameter/parameterlist/components/addModel.vue | 4 ++-- jero-web/src/views/regulationsKanban/index.vue | 12 +++++------- jero-web/vue.config.js | 1 + 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/jero-web/public/v2.js b/jero-web/public/v2.js index ce0472827..a734bb68b 100644 --- a/jero-web/public/v2.js +++ b/jero-web/public/v2.js @@ -1 +1 @@ -!function(){"use strict";function e(e){return e===undefined||null===e}function t(e){return e!==undefined&&null!==e}function n(e){return null!==e&&"object"===(void 0===e?"undefined":d(e))}function r(e){return"object"===(void 0===e?"undefined":d(e))&&e instanceof HTMLElement}function o(e){var t=e&&e.toString().match(/^\s*function (\w+)/);return t?t[1]:""}function i(){return new RegExp("MSIE (\\d+\\.\\d+);").test(navigator.userAgent),parseFloat(RegExp.$1)||Infinity}function a(e,t){for(var n in t)e[n]=t[n];return e}function c(e){var t=Object.create(null);return function(n){return t[n]||(t[n]=e(n))}}function u(e){return p.call(e).slice(8,-1)}function s(e){throw new Error("Vaptcha error: "+e)}function l(e){var t=e.mode,n=e.outage;return!!t&&"downtime"===(t=t.toLowerCase())&&!!n}function Promise(e){var t=this;this.state="pending",this.value=undefined,this.reason=undefined,this.onResolveAsyncCallbacks=[],this.onRejectAsyncCallbacks=[];var n=function(e){"pending"===t.state&&(t.state="fulfilled",t.value=e,t.onResolveAsyncCallbacks.map(function(e){return e()}))},r=function(e){"pending"===t.state&&(t.state="rejected",t.reason=e,t.onRejectAsyncCallbacks.map(function(t){return t(e)}))};try{e(n,r)}catch(o){r(o)}}window.HTMLElement=window.HTMLElement||Element,Array.prototype.map||(Array.prototype.map=function(e,t){var n,r,o;if(null==this)throw new TypeError(" this is null or not defined");var i=Object(this),a=i.length>>>0;if("[object Function]"!=Object.prototype.toString.call(e))throw new TypeError(e+" is not a function");for(t&&(n=t),r=new Array(a),o=0;o>>0;if(0===r)return!1;for(var o=0|t,i=Math.max(o>=0?o:r-Math.abs(o),0);i>>0;if("function"!=typeof e)throw new TypeError("predicate must be a function");for(var r=arguments[1],o=0;o-1||r.indexOf("https://")>-1;return r.indexOf("?")<0&&(i="?"+i.slice(1)),a?""+r+i:""+e+t+r+i},o=function(e){var t=document.getElementsByTagName("head")[0],n=document.createElement("script");return n.charset="UTF-8",n.src=e,t.appendChild(n),{remove:function(){t.removeChild(n)}}},i=function(e,t){return t=t||{},new Promise(function(n){var i="VaptchaJsonp"+(new Date).valueOf();window[i]&&(i+="1"),a(t,{callback:i}),e=r(e,t);var c=o(e),u=setTimeout(function(){clearTimeout(u),window[i]=null,c.remove(),n({code:"0703",msg:"Time out,Refresh Again!"})},1e4);window[i]=function(){clearTimeout(u),n.apply(this,arguments),c.remove(),window[i]=null}})};return i.setConfig=function(n){e=n.protocol||e,t=n.api_server||t},i}(),g={getConfig:function(e){return y("/config",{id:e.vid,type:e.type,scene:e.scene||""})},refresh:function(e){return y("/refresh",e)},click:function(e){return y("/click",e)},get:function(e){return y("/get",e)},verify:function(e){return y("/verify",e)},userbehavior:function(e){return y("/userbehavior",e)}},w={"0201":"id empty","0202":"id error","0208":"scene error","0209":"request used up","0906":"params error","0702":"domain not match"},b=function(){var o=!1,c=function(e){var t=new v(e);return t.add("outage","required","please configure outage"),t.validate(),a(e,{js_path:"vaptcha-sdk-downtime.2.0.2.js",api_server:window.location.host,protocol:window.location.protocol+"//",mode:"DownTime"}),y.setConfig(e),y(e.outage,{action:"get"}).then(function(t){return t.code!==m.Success?(s(w[t.msg]||t.msg),Promise.reject(t.code)):(a(e,t),Promise.resolve())})},f=function(e){return l(e)?c(e):g.getConfig(e).then(function(t){return t.code!==m.Success?(s(w[t.msg]||t.msg),Promise.reject(t.code)):(t.type!==e.type&&(t.mode=t.type,t.type=e.type),a(e,t),l(e)?c(e):Promise.resolve())})},d=function(e,t){return""+e.protocol+e.cdn_servers[0]+"/"+t},p=function(t){var n=document.getElementsByTagName("head")[0],r=document.getElementById("vaptcha_style");return new Promise(function(o){e(r)?(r=document.createElement("link"),a(r,{rel:"stylesheet",type:"text/css",href:t,id:"vaptcha_style",onload:o}),n&&n.appendChild(r)):o()})},b=function C(e){var n=document.getElementsByTagName("head")[0],r=document.querySelector("script[src='"+e+"']");return new Promise(function(o){if(t(r))return void(r.loaded?o():setTimeout(function(){return C(e).then(o)}));r=document.createElement("script");var i=function(){r.readyState&&"loaded"!==r.readyState&&"complete"!==r.readyState||(o(),r.loaded=!0,r.onload=null,r.onreadystatechange=null)};a(r,{async:!0,charset:"utf-8",src:e,onerror:function(){return s("load sdk timeout")},onload:i,onreadystatechange:i}),n.appendChild(r)})},j=function T(e){var t=e.sdkName,n=e.config,r=d(n,n.js_path);return b(r).then(function(){var e=window["_"+h(t)+"Vaptcha"],r=new e(n);return r.vaptcha.resetCaptcha=function(e,t){a(n,t),T({sdkName:e,config:n}).then(function(e){r.destroy(),r.options=e.options,r.vaptcha=e.vaptcha,e.render(),"character"===n.mode&&["click","float","popup"].includes(n.type)&&e.vaptcha.dtClickCb({target:e.vaptcha.btnDiv})})},Promise.resolve(r)})},A=function(e){o=!0,e.https=!0,e.protocol="https://",y.setConfig(e),!["embed","popup","invisible"].includes(e.type)&&(e.type="popup"),i()<9&&b(d(e,e.canvas_path));var t=new v(e);if(t.addValidateRules({elementOrSelector:function(t,o){if("String"===u(e.container)&&(e.container=document.querySelector(e.container)),n(e.container)&&r(e.container[0])&&(e.container=e.container[0]),!r(e.container))return o}}),t.add("vid","required","please configure vid"),"invisible"!==e.type&&t.add("container","elementOrSelector","please configure container with element or selector"),t.validate())return f(e).then(function(){var t="theme_https."+e.css_version+".css",n=d(e,t);return p(n)}).then(function(){var t=e.mode||e.type;return o=!1,j({sdkName:t,config:e})})};return function S(e){return new Promise(function(t){o?setTimeout(function(){S(e).then(t)},1e3):A(e).then(t)})["catch"](function(e){return o=!1,s(e),Promise.reject(e)})}}(),j=function(){var e=function(e){var n=e.getAttribute("data-config"),r={};if(t(n))try{r=JSON.parse(n)}catch(o){s("dom config format error")}return r},n=function(e){var n=e.getAttribute("data-vid");return t(n)?{vid:n}:{}},r=function(e,n){var r=Object.create(f);r.container=e,a(r,n),t(r.vid)&&b(r).then(function(e){e.renderTokenInput(),e.render()})};return function(){for(var t=document.querySelectorAll("[data-vid]"),o=document.querySelectorAll("[data-config]"),i=0;i>>0;if("[object Function]"!=Object.prototype.toString.call(e))throw new TypeError(e+" is not a function");for(t&&(n=t),r=new Array(a),o=0;o>>0;if(0===r)return!1;for(var o=0|t,i=Math.(o>=0?o:r-Math.abs(o),0);i>>0;if("function"!=typeof e)throw new TypeError("predicate must be a function");for(var r=arguments[1],o=0;o-1||r.indexOf("https://")>-1;return r.indexOf("?")<0&&(i="?"+i.slice(1)),a?""+r+i:""+e+t+r+i},o=function(e){var t=document.getElementsByTagName("head")[0],n=document.createElement("script");return n.charset="UTF-8",n.src=e,t.appendChild(n),{remove:function(){t.removeChild(n)}}},i=function(e,t){return t=t||{},new Promise(function(n){var i="VaptchaJsonp"+(new Date).valueOf();window[i]&&(i+="1"),a(t,{callback:i}),e=r(e,t);var c=o(e),u=setTimeout(function(){clearTimeout(u),window[i]=null,c.remove(),n({code:"0703",msg:"Time out,Refresh Again!"})},1e4);window[i]=function(){clearTimeout(u),n.apply(this,arguments),c.remove(),window[i]=null}})};return i.setConfig=function(n){e=n.protocol||e,t=n.api_server||t},i}(),g={getConfig:function(e){return y("/config",{id:e.vid,type:e.type,scene:e.scene||""})},refresh:function(e){return y("/refresh",e)},click:function(e){return y("/click",e)},get:function(e){return y("/get",e)},verify:function(e){return y("/verify",e)},userbehavior:function(e){return y("/userbehavior",e)}},w={"0201":"id empty","0202":"id error","0208":"scene error","0209":"request used up","0906":"params error","0702":"domain not match"},b=function(){var o=!1,c=function(e){var t=new v(e);return t.add("outage","required","please configure outage"),t.validate(),a(e,{js_path:"vaptcha-sdk-downtime.2.0.2.js",api_server:window.location.host,protocol:window.location.protocol+"//",mode:"DownTime"}),y.setConfig(e),y(e.outage,{action:"get"}).then(function(t){return t.code!==m.Success?(s(w[t.msg]||t.msg),Promise.reject(t.code)):(a(e,t),Promise.resolve())})},f=function(e){return l(e)?c(e):g.getConfig(e).then(function(t){return t.code!==m.Success?(s(w[t.msg]||t.msg),Promise.reject(t.code)):(t.type!==e.type&&(t.mode=t.type,t.type=e.type),a(e,t),l(e)?c(e):Promise.resolve())})},d=function(e,t){return""+e.protocol+e.cdn_servers[0]+"/"+t},p=function(t){var n=document.getElementsByTagName("head")[0],r=document.getElementById("vaptcha_style");return new Promise(function(o){e(r)?(r=document.createElement("link"),a(r,{rel:"stylesheet",type:"text/css",href:t,id:"vaptcha_style",onload:o}),n&&n.appendChild(r)):o()})},b=function C(e){var n=document.getElementsByTagName("head")[0],r=document.querySelector("script[src='"+e+"']");return new Promise(function(o){if(t(r))return void(r.loaded?o():setTimeout(function(){return C(e).then(o)}));r=document.createElement("script");var i=function(){r.readyState&&"loaded"!==r.readyState&&"complete"!==r.readyState||(o(),r.loaded=!0,r.onload=null,r.onreadystatechange=null)};a(r,{async:!0,charset:"utf-8",src:e,onerror:function(){return s("load sdk timeout")},onload:i,onreadystatechange:i}),n.appendChild(r)})},j=function T(e){var t=e.sdkName,n=e.config,r=d(n,n.js_path);return b(r).then(function(){var e=window["_"+h(t)+"Vaptcha"],r=new e(n);return r.vaptcha.resetCaptcha=function(e,t){a(n,t),T({sdkName:e,config:n}).then(function(e){r.destroy(),r.options=e.options,r.vaptcha=e.vaptcha,e.render(),"character"===n.mode&&["click","float","popup"].includes(n.type)&&e.vaptcha.dtClickCb({target:e.vaptcha.btnDiv})})},Promise.resolve(r)})},A=function(e){o=!0,e.https=!0,e.protocol="https://",y.setConfig(e),!["embed","popup","invisible"].includes(e.type)&&(e.type="popup"),i()<9&&b(d(e,e.canvas_path));var t=new v(e);if(t.addValidateRules({elementOrSelector:function(t,o){if("String"===u(e.container)&&(e.container=document.querySelector(e.container)),n(e.container)&&r(e.container[0])&&(e.container=e.container[0]),!r(e.container))return o}}),t.add("vid","required","please configure vid"),"invisible"!==e.type&&t.add("container","elementOrSelector","please configure container with element or selector"),t.validate())return f(e).then(function(){var t="theme_https."+e.css_version+".css",n=d(e,t);return p(n)}).then(function(){var t=e.mode||e.type;return o=!1,j({sdkName:t,config:e})})};return function S(e){return new Promise(function(t){o?setTimeout(function(){S(e).then(t)},1e3):A(e).then(t)})["catch"](function(e){return o=!1,s(e),Promise.reject(e)})}}(),j=function(){var e=function(e){var n=e.getAttribute("data-config"),r={};if(t(n))try{r=JSON.parse(n)}catch(o){s("dom config format error")}return r},n=function(e){var n=e.getAttribute("data-vid");return t(n)?{vid:n}:{}},r=function(e,n){var r=Object.create(f);r.container=e,a(r,n),t(r.vid)&&b(r).then(function(e){e.renderTokenInput(),e.render()})};return function(){for(var t=document.querySelectorAll("[data-vid]"),o=document.querySelectorAll("[data-config]"),i=0;i { - let reg = /^[0-9a-zA-Z-]{1,}$/ + let reg = /^[0-9a-zA-Z-/. ]{1,}$/ // 编号的限制 if(item.paramsNumber == '' || item.paramsNumber === undefined) { this.$message.warning(this.$t('standard')+this.$t('cannotEmpty')) diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 37e7d1b14..bbbf53682 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -170,13 +170,11 @@ export default { { title: this.$t('standard'), align: 'center', - width: '10%', dataIndex: 'standard' }, { title: this.$t('title'), align: 'center', - width: '10%', dataIndex: 'title' }, { @@ -184,11 +182,11 @@ export default { align: 'center', dataIndex: 'status' }, - { - title: this.$t('category'), - align: 'center', - dataIndex: 'category' - }, + // { + // title: this.$t('category'), + // align: 'center', + // dataIndex: 'category' + // }, { title: this.$t('technicalField'), align: 'center', diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js index 5f7026e56..cc121368a 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -95,6 +95,7 @@ module.exports = { target: 'http://localhost:8080', //请求本地 jero-boot后台项目 // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目 // target: 'http://10.0.1.25:8080', + // target: 'http://10.0.1.5:8080', ws: false, changeOrigin: true } From f515bb8ef4f897b43d7bd93f299f4a42392aaba3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 16:31:31 +0800 Subject: [PATCH 05/14] update --- .../IBussDocumentLibraryEOService.java | 3 +++ .../BussDocumentLibraryEOServiceImpl.java | 4 ++-- .../LawsTechnologyEvaluationItemResultEO.java | 2 ++ ...logyEvaluationItemResultEOServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index 7d99310b8..4b392e7fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.OSSFileForDocumentLibrary; +import com.jero.modules.document.vo.QueryConditionVO; import com.jero.modules.oss.entity.OSSFile; import org.springframework.web.multipart.MultipartFile; @@ -220,4 +221,6 @@ public interface IBussDocumentLibraryEOService extends IService parameter); String getTitle(String id,String cut); + + String sqlJoint(List queryConditionVOList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 655b5e6f3..e948eb81b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -5755,8 +5755,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl queryConditionVOList){ + @Override + public String sqlJoint(List queryConditionVOList){ StringBuilder sb = new StringBuilder(); if(queryConditionVOList.size() != 0){ int count =0; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java index c807864a6..5ab32f3d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/entity/LawsTechnologyEvaluationItemResultEO.java @@ -122,6 +122,8 @@ public class LawsTechnologyEvaluationItemResultEO implements Serializable { @Excel(name = "评估人id", width = 15) @ApiModelProperty(value = "评估人id") private java.lang.String evaluatorId; + @TableField(exist = false) + private java.lang.String evaluatorName; /**流程实例id*/ @Excel(name = "流程实例id", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 1369b2036..05006409c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -21,6 +21,8 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; import com.jero.modules.system.entity.SysCategory; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.util.PDFUtils; import org.apache.commons.collections4.CollectionUtils; @@ -62,6 +64,8 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl private SysCategoryServiceImpl sysCategoryService; @Autowired private IOSSFileService iOSSFileService; + @Autowired + private ISysUserService sysUserService; /** * 保存 @@ -190,6 +194,13 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl @Override public void disposeData(List datas, String cut) { if(CollectionUtils.isNotEmpty(datas)){ + List evaluatorIdList = datas.stream().map(LawsTechnologyEvaluationItemResultEO::getEvaluatorId).distinct().collect(Collectors.toList()); + + List sysUserList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(evaluatorIdList)){ + sysUserList = this.sysUserService.querySysUserListByIdList(evaluatorIdList); + } + List categoryList = sysCategoryService.list(); for (LawsTechnologyEvaluationItemResultEO data : datas) { String evaluationMethods = data.getEvaluationMethods(); @@ -205,6 +216,19 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl String accessoryFileName = accessoryFileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); data.setAccessoryFileName(accessoryFileName); } + + if(StringUtils.isNotEmpty(data.getEvaluatorId())){ + if(CollectionUtils.isNotEmpty(sysUserList)){ + String evaluatorNames = sysUserList.stream().filter(sysUser -> { + boolean flag = false; + if(StringUtils.equals(sysUser.getId(),data.getEvaluatorId())){ + flag = true; + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + data.setEvaluatorName(evaluatorNames); + } + } } } } From 9e36b04f8b38df4b1c071d644297711432b43a42 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 15 Jul 2022 16:33:09 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E5=88=97=E8=A1=A8-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/parameter/parameterlist/components/addModel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 3994cbf2f..0ef417a29 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -385,7 +385,7 @@ export default { // { required: true, message: this.$t('pleaseSelect')+this.$t('certificationCategory'), type: 'array', trigger: 'change' }, ], isMust: [ - { required: true, message: this.$t('pleaseSelect')+this.$t('Required'), trigger: 'change' }, + { required: true, message: this.$t('PleaseEnter')+this.$t('Required'), trigger: 'change' }, ], paramsName: [ { required: true, message: this.$t('pleaseSelect')+this.$t('ParameterName'), trigger: 'blur' }, From 1e4eac791ab553dafef30d23cf02e2fe19485188 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 16:34:29 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsClause.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index b9b258dad..8d2edd675 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -35,10 +35,10 @@ + v-model="queryParam.evaluatorIdName"/> @@ -167,7 +167,7 @@ }, { title: this.$t('Assessor'), - dataIndex: 'Assessor', + dataIndex: 'evaluatorName', align: 'center', ellipsis: true, width: 160 From e1fa0a544343518fd751177b86199c3cb3b8aa35 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 16:49:55 +0800 Subject: [PATCH 08/14] update --- .../LawsTechnologyEvaluationComplianceResultEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java index 59b68e181..9bef97e7a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -209,7 +209,7 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi for (int i = 0; i < exportData.size(); i++){ //使用评估人的名字命名sheet页 - HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy() + " " + sheetName); + HSSFSheet sheet = workbook.createSheet(exportData.get(i).getCreateBy() + " " + sheetName + "" + (i + 1)); CellStyle titleCellStyle = workbook.createCellStyle(); titleCellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 From b2e3a1b8665b600b379764f9569386d99c38fcd6 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 15 Jul 2022 17:10:04 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9-=E7=BC=96=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E6=95=B0=E7=82=B9=E5=B7=A6=E6=96=9C=E6=9D=A0?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsInfoEOServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 6230b8ec3..67cffe1bd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 17:30:08 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=8F=98=E6=9B=B4=EF=BC=9A?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9Fbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/collect/entity/ParamsCollectManifestBaseEO.java | 3 +++ .../service/impl/ParamsCollectManifestEOServiceImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java index 8e42caf35..ab5cc26e9 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestBaseEO.java @@ -1,6 +1,8 @@ package com.jero.modules.cert.collect.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -119,6 +121,7 @@ public class ParamsCollectManifestBaseEO implements Serializable { /**工程接口人*/ @Excel(name = "工程接口人", width = 15) @ApiModelProperty(value = "工程接口人") + @TableField(updateStrategy = FieldStrategy.IGNORED) private String sdt; /**填写人*/ diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 16c1754a6..3821d7723 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1226,8 +1226,14 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 17:36:24 +0800 Subject: [PATCH 11/14] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index 7af3627da..b16e49cfb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -195,6 +195,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ } // 处理同步过来的数据id不同，username相同的情况 creation_time不能为空 // ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); + ppEmployeeList = ppEmployeeList.stream().distinct().collect(Collectors.toList()); // 去重 //此处获取全部pp用户信息 List sysUserList = sysUserService.getPPEmployeeList(); From 54e23f4bc40e1cd25c30ea71ef53384102986778 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 17:57:13 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 34ab134c9..03f462ef7 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -117,7 +117,7 @@ @cancel="cancel"> --> @@ -146,7 +147,7 @@
- {{$t('preservation')}} + {{$t('preservation')}} {{$t('cancel')}}
@@ -278,6 +279,7 @@ indeterminate: false, columns: [], content: [], + confirmLoading:false, selectedRowKeys: [], selectedRowrowValue: [], dataSource: [], @@ -348,6 +350,12 @@ return 'rowClassRed' } }, + handleInput(value) { + this.$nextTick(() => { + this.Dateline = { ...this.Dateline } + this.$refs.ruleFormOne.validateField([value]) + }) + }, pageOnChange(page, pageSize) { this.pageNo = page this.$emit('handlePreservation') @@ -415,8 +423,9 @@ handleSubmitzr(record) { let _this = this let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, } - this.$refs.ruleForm.validate(valid => { + this.$refs.ruleFormOne.validate(valid => { if (valid) { + this.confirmLoading = true axios({ url: '/jero-boot/params/collectManifest/updateDutyTerritory', method: 'post', @@ -442,8 +451,10 @@ } else { _this.$message.warning(_this.$t('operationFailed')) } + this.confirmLoading = false }) .catch((error) => { + this.confirmLoading = false console.log(error) }) } @@ -494,7 +505,7 @@ }, cancel(){ this.areaVisiblezr = false - this.$refs['ruleForm'].resetFields() + this.$refs['ruleFormOne'].resetFields() }, // 点击工程接口人的详情人员 有权限 areaOfResponsibility(record) { @@ -513,7 +524,7 @@ this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtId = record.id - this.$refs.ruleForm.clearValidate() + this.$refs.ruleFormOne.clearValidate() }) }, dataValueTobeinitiated() { From ece28554dedd50b34b7d19ad4ce9220bde7e7865 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 18:33:12 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E7=9C=8B=E6=9D=BF-=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...logyEvaluationItemResultEOServiceImpl.java | 36 +++- .../LawsComplianceBoardController.java | 45 ++++ .../mapper/LawsComplianceBoardMapper.java | 24 +++ .../mapper/xml/LawsComplianceBoardMapper.xml | 65 ++++++ .../service/ILawsComplianceBoardService.java | 18 ++ .../impl/LawsComplianceBoardServiceImpl.java | 201 ++++++++++++++++++ 6 files changed, 386 insertions(+), 3 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsComplianceBoardController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsComplianceBoardMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsComplianceBoardService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java index 05006409c..1da77c4a4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java @@ -20,6 +20,14 @@ import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.project.enums.OperatorTypeEnum; import com.jero.modules.project.enums.RequestSourceEnum; +import com.jero.modules.split.dto.FileSpiltValTableExportDto; +import com.jero.modules.split.dto.FileSplitValExportDto; +import com.jero.modules.split.dto.FileSplitValImgExportDto; +import com.jero.modules.split.entity.SarFileSplitItemsValEO; +import com.jero.modules.split.page.SarFileSplitItemsEOPage; +import com.jero.modules.split.page.SarFileSplitItemsValEOPage; +import com.jero.modules.split.service.IFileSplitItemsEOService; +import com.jero.modules.split.service.ISarFileSplitItemsValEOService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -66,6 +74,10 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl private IOSSFileService iOSSFileService; @Autowired private ISysUserService sysUserService; + @Autowired + private IFileSplitItemsEOService fileSplitItemsEOService; + @Autowired + private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService; /** * 保存 @@ -276,7 +288,7 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl //创建表头 String[] titleArr = title.split(","); - for (int i=0; i<=5; i++){ + for (int i=0; i<=10; i++){ sheet.setColumnWidth(i,4000); Cell cell = firstRow.createCell(i); cell.setCellStyle(titleCellStyle); @@ -285,12 +297,30 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl //设置导出数据 if(CollectionUtils.isNotEmpty(exportData)) { + List allTableList = new ArrayList<>(); // 存储表格数据 + List allImgList = new ArrayList<>(); // 存储文件数据 + SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage(); + for (int dataIndex = 0; dataIndex < exportData.size(); dataIndex++) { Row dataRow = sheet.createRow(dataIndex + 1); dataRow.createCell(0).setCellValue(exportData.get(dataIndex).getItemNum()); dataRow.createCell(1).setCellValue(exportData.get(dataIndex).getItemName()); - dataRow.createCell(2).setCellValue(exportData.get(dataIndex).getItemContent()); - dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getCreateBy()); + + String itemContent = exportData.get(dataIndex).getItemContent(); + + if(StringUtils.isNotEmpty(exportData.get(dataIndex).getItemId())){ + SarFileSplitItemsValEOPage valEOPage = new SarFileSplitItemsValEOPage(); + valEOPage.setItemId(exportData.get(dataIndex).getItemId()); + valEOPage.setOrderBy("DISPLAY_SEQ,ID"); + List getValList = this.sarFileSplitItemsValEOService.queryByList(valEOPage); + List valContentList = this.fileSplitItemsEOService.combineItemValInfo(getValList,allTableList,allImgList,page); //TODO + if(CollectionUtils.isNotEmpty(valContentList)){ + itemContent = valContentList.get(0).getValContent(); + } + } + + dataRow.createCell(2).setCellValue(itemContent); + dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getEvaluatorName()); dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getEvaluationMethodsName()); dataRow.createCell(5).setCellValue(exportData.get(dataIndex).getTechnicalFileName()); dataRow.createCell(6).setCellValue(exportData.get(dataIndex).getSection()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsComplianceBoardController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsComplianceBoardController.java new file mode 100644 index 000000000..b5167fba8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/LawsComplianceBoardController.java @@ -0,0 +1,45 @@ +package com.jero.modules.project.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.project.service.ILawsComplianceBoardService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONObject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(tags="法规符合性看板") +@RestController +@RequestMapping("/project/lawsComplianceBoard") +@Slf4j +public class LawsComplianceBoardController { + + @Autowired + private ILawsComplianceBoardService lawsComplianceBoardService; + + @AutoLog(value = "项目库-法规符合性看板列表分页查询") + @ApiOperation(value="项目库-法规符合性看板列表分页查询", notes="项目库-法规符合性看板列表分页查询") + @GetMapping(value = "/page") + public JSONObject queryPageList(@RequestParam Map params){ + IPage infoPage = this.lawsComplianceBoardService.queryPageList(params); + Result ok = Result.OK(infoPage); + JSONObject jsonResult = JSONObject.fromObject(ok); + return jsonResult; + } + + @AutoLog(value = "项目库-法规符合性看板-查询符合性结果列表") + @ApiOperation(value="项目库-法规符合性看板-查询符合性结果列表", notes="项目库-法规符合性看板-查询符合性结果列表") + @GetMapping(value = "/queryComplianceResultList") + public Result queryComplianceResultList(@RequestParam Map params){ + JSONObject result = this.lawsComplianceBoardService.queryComplianceResultList(params); + return Result.OK(result); + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsComplianceBoardMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsComplianceBoardMapper.java new file mode 100644 index 000000000..cc7849ae8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/LawsComplianceBoardMapper.java @@ -0,0 +1,24 @@ +package com.jero.modules.project.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +public interface LawsComplianceBoardMapper { + /** + * 查询出 启动过 设计、prehomo、验证符合性、法规技术评估、法规意见收集其中一个流程 的数据 + * @param page + * @param params + * @return + */ + IPage queryPageList(IPage page, @Param("params") Map params); + + /** + * 项目库-法规符合性看板-查询符合性结果列表 + * @param params + * @return + */ + List> queryComplianceResultList(@Param("params") Map params); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml new file mode 100644 index 000000000..08027e0bf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsComplianceBoardService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsComplianceBoardService.java new file mode 100644 index 000000000..12260ef23 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/ILawsComplianceBoardService.java @@ -0,0 +1,18 @@ +package com.jero.modules.project.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import net.sf.json.JSONObject; + +import java.util.Map; + +public interface ILawsComplianceBoardService { + IPage queryPageList(Map params); + + /** + * 项目库-法规符合性看板-查询符合性结果列表 + * @param params + * @return + */ + JSONObject queryComplianceResultList(Map params); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java new file mode 100644 index 000000000..c95840dda --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -0,0 +1,201 @@ +package com.jero.modules.project.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.document.vo.QueryConditionVO; +import com.jero.modules.lawsOpinionGather.entity.LawsOpinionGatherEO; +import com.jero.modules.lawsOpinionGather.service.ILawsOpinionGatherEOService; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService; +import com.jero.modules.project.mapper.LawsComplianceBoardMapper; +import com.jero.modules.project.service.ILawsComplianceBoardService; +import com.jero.modules.system.util.StringUtils; +import net.sf.json.JSONObject; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +@Service +@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) +public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardService { + + @Autowired + private LawsComplianceBoardMapper lawsComplianceBoardMapper; + @Autowired + private ILawsOpinionGatherEOService lawsOpinionGatherEOService; + @Autowired + private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService; + @Autowired + private IBussDocumentLibraryEOService bussDocumentLibraryEOService; + + @Override + public IPage queryPageList(Map params) { + int pageNo = Integer.parseInt(params.get("pageNo").toString()); + int pageSize = Integer.parseInt(params.get("pageSize").toString()); + + //封装查询条件(包含高级搜索) + String condition = this.getConditionStr(params); + params.put("condition",condition); + IPage page = new Page(pageNo, pageSize); + IPage infoPage = this.lawsComplianceBoardMapper.queryPageList(page, params); + List records = infoPage.getRecords(); + this.disposeData(records); + return infoPage; + } + + public void disposeData(List datas){ + if (CollectionUtils.isNotEmpty(datas)) { + for (Object data : datas) { + Map dataMap = (Map) data; + } + } + } + + @Override + public JSONObject queryComplianceResultList(Map params) { + JSONObject result = new JSONObject(); + String id = (String) params.get("id"); + String cut = (String) params.get("cut"); + List> cmplianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params); + result.put("cmplianceResultList",cmplianceResultList); + + //查询当前数据是否有法规意见收集流程数据 + QueryWrapper opinionGatherEOQueryWrapper = new QueryWrapper<>(); + opinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getStandId,id); + int opinionGatherCount = this.lawsOpinionGatherEOService.count(opinionGatherEOQueryWrapper); + result.put("opinionGather",opinionGatherCount); + + //查询当前数据是否有法规技术评估流程数据 + QueryWrapper evaluationEOQueryWrapper = new QueryWrapper<>(); + evaluationEOQueryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getStandId,id); + int evaluationCount = this.lawsTechnologyEvaluationEOService.count(evaluationEOQueryWrapper); + result.put("technologyEvaluation",evaluationCount); + return result; + } + + + @NotNull + public String getConditionStr(Map parameter) { + String cut = (String) parameter.get("cut"); + String flag = String.valueOf(parameter.get("flag")); + //查询条件 + StringBuilder conditionSb = new StringBuilder(""); + + //过滤查询条件字段类型使用 + List> mapList = this.bussDocumentLibraryEOService.queryCondition("1", cut, null); + + //查询条件处理 + for (Map.Entry entry : parameter.entrySet()) { + String key = entry.getKey(); + if (!"pageNo".equals(key) && !"pageSize".equals(key)) { + String value = ""; + if(ObjectUtils.isNotEmpty(entry.getValue())){ + value = StringUtils.valueOf(entry.getValue()); + } + if (StringUtils.isNotBlank(value)) { + for (Map map : mapList) { + String fieldName = (String) map.get("db_field_name");//字段 + if (key.equals(fieldName)) { + //字段类型(判断是输入框还是下拉,等等) + String fieldType = (String) map.get("field_show_type");//字段类型 + if (FieldTypeEnum.TEXT_STRING.getValue().equals(fieldType) || FieldTypeEnum.TEXT_NUMBER.getValue().equals(fieldType)) { + //输入框 LIKE CONCAT("%", '/%', "%") ESCAPE '/' + if (value.contains("%")) { + value = value.replace("%", "/%"); + } + conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'"); + } else if (FieldTypeEnum.PULL_SINGLE.getValue().equals(fieldType) + || FieldTypeEnum.PULL_MORE.getValue().equals(fieldType) + || FieldTypeEnum.TREE.getValue().equals(fieldType)) { + StringBuilder valueSb = new StringBuilder(); + StringBuilder condition = new StringBuilder(); + for (String valueTemp : value.split(",")) { + valueSb.append("'" + valueTemp + "',"); + condition.append(" or " + key + " like concat(concat('%','" + valueTemp + "'),'%')"); + } + condition.append(")"); + String substring = valueSb.substring(0, valueSb.length() - 1); + //下拉单选或下拉多选 + conditionSb.append(" and (" + key + " in(" + substring + ")" + condition.toString()); + + } else if (FieldTypeEnum.DATE_SINGLE.getValue().equals(fieldType)) { + //日期(区分单日期还时间范围) + if (value.contains(",")) { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') >= '" + value.split(",")[0] + "'" + + " and " + "date_format(" + key + ",'%Y-%m-%d') <= '" + value.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + key + ",'%Y-%m-%d') = '" + value + "'"); + } + } else if (FieldTypeEnum.PERSON.getValue().equals(fieldType)) { + //输入框 LIKE CONCAT("%", '/%', "%") ESCAPE '/' + if (value.contains("%")) { + value = value.replace("%", "/%"); + } + conditionSb.append(" and " + key + " like concat(concat('%','" + value + "'),'%') ESCAPE '/'"); + } + } + } + } + } + + } + + //处理法规预警模块预警时间查询条件 flag = 0(新车实施日期), flag = 1(在产车实施日期) + String warnTime = (String) parameter.get("WarnTime"); + if(StringUtils.isNotBlank(warnTime)){ + if("0".equals(flag)){ + //日期(区分单日期还时间范围) + if (warnTime.contains(",")) { + conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + }else{ + //日期(区分单日期还时间范围) + if (warnTime.contains(",")) { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" + + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); + } else { + conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); + } + } + } + + //高级搜索 queryConditionVOList List + if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ + String queryConditionVOListStr = (String) parameter.get("queryConditionVOList"); + List queryConditionVOList = com.alibaba.fastjson.JSONObject.parseArray(queryConditionVOListStr, QueryConditionVO.class); + if(ObjectUtils.isNotEmpty(queryConditionVOList)){ + String queryCondition = this.bussDocumentLibraryEOService.sqlJoint(queryConditionVOList); + if(StringUtils.isNotBlank(queryCondition)){ + conditionSb.append(" and " + queryCondition); + } + } + } + + //处理列表表头排序 + /*if (StringUtils.isNotBlank((String) parameter.get("orderByField"))) { + conditionSb.append(" order by " + (String) parameter.get("orderByField")); + if ("1".equals((String) parameter.get("orderBy"))) { + conditionSb.append(" asc");//正序 + } else if ("2".equals((String) parameter.get("orderBy"))) { + conditionSb.append(" desc");//倒序 + } + } else { + conditionSb.append(" order by create_time desc"); + }*/ + String condition = conditionSb.toString(); + return condition; + } +} From 0640a5a102b3bfa8a6fbc0ee793b5abc30b55490 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 15 Jul 2022 18:37:13 +0800 Subject: [PATCH 14/14] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8?= =?UTF-8?q?=E6=88=B7bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SyncDataServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index b16e49cfb..d207015c4 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -159,6 +159,13 @@ public class SyncDataServiceImpl implements ISyncDataService{ //people获取用户信息Map Map PPEmployeeMap=new HashMap(); + //此处获取全部pp用户信息 + List sysUserList = sysUserService.getPPEmployeeList(); +// log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList)); + for(SysUser user:sysUserList){ + localUserMap.put(user.getThirdId(),user); + } + String path = "/people/v1/employee/all-info"; String queryStr = "app_id=" + appId + "&hash_type=sha256&offset=0&limit=100"; String response = getResultDataOfGet(path, queryStr); @@ -197,12 +204,6 @@ public class SyncDataServiceImpl implements ISyncDataService{ // ppEmployeeList.sort(Comparator.comparing(PPEmployee::getCreation_time).reversed()); ppEmployeeList = ppEmployeeList.stream().distinct().collect(Collectors.toList()); // 去重 - //此处获取全部pp用户信息 - List sysUserList = sysUserService.getPPEmployeeList(); -// log.info("查询到的用户信息结果集为："+JSONObject.toJSONString(userEOList)); - for(SysUser user:sysUserList){ - localUserMap.put(user.getThirdId(),user); - } // log.info("将用户信息集合转换为的用户MAP为："+JSONObject.toJSONString(localUserMap)); log.info("开始更新数据库信息"); for(PPEmployee ppEmployee:ppEmployeeList){