WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
liyawei
2022-10-25 16:24:59 +08:00
parent 8c4f948a86 0e9f507852
commit 8371b71631
9 changed files with 73 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java
+3 -1
View File
@@ -393,7 +393,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl<SarFileCom
cell.setCellStyle(cellStyle);
}
}
i = i + leftSplit.length;
int left_length = ObjectUtils.isEmpty(leftSplit) ? 0 : leftSplit.length;
int right_length = ObjectUtils.isEmpty(rightSplit) ? 0 : rightSplit.length;
i = left_length > right_length ? i + left_length : i + right_length;
}
if (includeComments || StringUtils.isEmpty(selectIds)) {
Row row = sheet.createRow(i);
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java
+11 -2
View File
@@ -191,14 +191,23 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl<LawsOp
this.disposeData(exportData,lawsOpinionAssessmentResultEO,cut);
String lawsOpinionGatherId = (String)params.get("lawsOpinionGatherId");
if(StringUtils.isEmpty(lawsOpinionGatherId)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
throw new JeroBootException("法规意见收集id为空，请检查！");
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
throw new JeroBootException("The lawsOpinionGatherId is empty, please check!");
}
}
LawsOpinionGatherEO lawsOpinionGatherEO = this.lawsOpinionGatherEOService.queryById(lawsOpinionGatherId);
String title = "";
String fileName = "";
if(StringUtils.equals(cut, CutEnum.CN.getValue())){
title = "相关章节,问题/建议,理由,条款内容,附件,评估人,提出时间";
fileName = "评估结果" + ".xls";
fileName = lawsOpinionGatherEO.getSerialNumber() + " 评估结果" + ".xls";
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
title = "Related section,IssueOrSuggest,Reason,Item Content,Accessory,Evaluator,Submit Date";
fileName = "Evaluation results" + ".xls";
fileName = lawsOpinionGatherEO.getSerialNumber() + " Evaluation results" + ".xls";
}
OutputStream os = null;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java
+15 -2
View File
@@ -11,11 +11,13 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.FileUtils;
import com.jero.common.util.oss.CosBootUtil;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationComplianceResultEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationResultEO;
import com.jero.modules.lawsTechnologyEvaluation.enums.ComplianceResultEnum;
import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationComplianceResultEOMapper;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationComplianceResultEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationFlowDetailEOService;
import com.jero.modules.lawsTechnologyEvaluation.service.ILawsTechnologyEvaluationResultEOService;
import com.jero.modules.oss.entity.OSSFile;
@@ -64,6 +66,8 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
private ILawsTechnologyEvaluationFlowDetailEOService lawsTechnologyEvaluationFlowDetailEOService;
@Autowired
private ISysUserService sysUserService;
@Autowired
private ILawsTechnologyEvaluationEOService lawsTechnologyEvaluationEOService;
/**
* 保存
@@ -173,6 +177,15 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
Map<String, Object> params) {
String ids = (String)params.get("ids");
String cut = (String)params.get("cut");
String lawsTechnologyEvaluationId = (String)params.get("lawsTechnologyEvaluationId");
if(StringUtils.isEmpty(lawsTechnologyEvaluationId)){
if(StringUtils.equals(cut,CutEnum.CN.getValue())){
throw new JeroBootException("法规技术评估id为空，请检查！");
}else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
throw new JeroBootException("The lawsTechnologyEvaluationId is empty, please check!");
}
}
LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = this.lawsTechnologyEvaluationEOService.queryById(lawsTechnologyEvaluationId);
if(!StringUtils.isEmpty(ids)){
lawsTechnologyEvaluationComplianceResultEO.setIds(ids);
@@ -187,12 +200,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi
if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){
title = "相关章节,问题说明,附件";
bottomTitle = "符合性结果：";
fileName = "评估结果" + ".xls";
fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " 评估结果" + ".xls";
sheetName = "反馈结果";
}else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){
title = "Related section,Problem description,Accessory";
bottomTitle = "Compliance results:";
fileName = "Evaluation results" + ".xls";
fileName = lawsTechnologyEvaluationEO.getSerialNumber() + " Evaluation results" + ".xls";
sheetName = "Feedback result";
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class LawsMonthlyReportWriteEO implements Serializable {
/**状态*/
@Excel(name = "状态", width = 15)
@ApiModelProperty(value = "状态")
@Dict(dicCode = "state")
@Dict(dicCode = "fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4")
private java.lang.String state;
/**用法*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+4 -4
View File
@@ -1050,10 +1050,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0];
String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1];
int mothLast = Integer.valueOf(mothNew) + 1;
int mothLast = Integer.valueOf(mothNew) - 1;
//添加说明 2022/7/15 至 2022/8/14 期间发布的主要内容
String text = year + "/" + mothNew +"/15 至 "+year+"/"+mothLast+"/14期间发布的主要内容";
String text = year + "/" + mothLast +"/15 至 "+year+"/"+mothNew+"/14期间发布的主要内容";
WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag);
@@ -1113,7 +1113,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
String year = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[0];
String mothNew = lawsMonthlyReportWriteEOS.get(0).getMonth().split("-")[1];
int mothLast = Integer.valueOf(mothNew) + 1;
int mothLast = Integer.valueOf(mothNew) - 1;
String moth = mothNew+"/"+year;
String mothNewEn = getMothEn(mothNew);
String mothLastEn = getMothEn(String.valueOf(mothLast));
@@ -1137,7 +1137,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
//添加说明 Update between July 15, 2022 and August 14, 2022
String text = "Update between "+mothNewEn+" 15,"+year+" and "+mothLastEn+" 14,"+year;
String text = "Update between "+mothLastEn+" 15,"+year+" and "+mothNewEn+" 14,"+year;
WordUtil.exportWord(document, text, null, ParagraphAlignment.CENTER, 0, 11,
false, false, "Blue Sky Noto Regular",null,null,flag);
jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue
+6 -2
View File
@@ -604,7 +604,7 @@
this.formInline[this.uploadName] = attIdList.join(',')
this.formInline = { ...this.formInline }
},
tempSaveClick(){
tempSaveClick() {
},
submit(releaseStatus) {
@@ -845,10 +845,14 @@
.box-input-index {
width: calc(100% - 130px);
display: inline-block;
height: 38px;
height: 48px;
margin-right: 10px;
}
/*::v-deep .box-input-index .ant-select-selection--multiple {*/
/* height: 44px!important;*/
/*}*/
.itemOption {
display: inline-block;
width: 100%;
jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+16 -8
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
jero-web/src/views/businessSupport/regulationReport/components/modules/industryTemplate.vue
+16 -8
View File
@@ -9,10 +9,14 @@
:title="$t('title')">{{$t('title')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleCn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleCn"
:placeholder="$t('PleaseEnter')+$t('title')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('title')"
v-model.trim="formInline.titleCn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleCn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('title')"/>-->
</a-form-model-item>
</div>
</a-col>
@@ -24,10 +28,14 @@
:title="$t('englishTitle')">{{$t('englishTitle')}}</span>
</div>
<a-form-model-item class="itemModel" prop="titleEn">
<a-input class="box-input"
:disabled="disabled"
v-model.trim="formInline.titleEn"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"/>
<a-textarea
:disabled="disabled"
:placeholder="$t('PleaseEnter')+$t('englishTitle')"
v-model.trim="formInline.titleEn" :rows="3"/>
<!-- <a-input class="box-input"-->
<!-- :disabled="disabled"-->
<!-- v-model.trim="formInline.titleEn"-->
<!-- :placeholder="$t('PleaseEnter')+$t('englishTitle')"/>-->
</a-form-model-item>
</div>
</a-col>
jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+1 -1
View File
@@ -266,7 +266,7 @@
form: {},
rules: {
name: [
{ required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
// { required: true, message: this.$t('PleaseEnter') + this.$t('clauseNo'), trigger: 'blur' },
{ min: 1, max: 200, message: this.$t('cantExeed') + '200' + this.$t('characters'), trigger: 'blur' }
],
itemName: [