core/src/main/java/com/zt/life/export/service/WordFileService.java
@@ -20,6 +20,7 @@ import java.awt.image.BufferedImage; import java.io.*; import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.*; @Service @@ -61,10 +62,14 @@ Object staticFieldValue = ReflectUtil.getFieldValue(dataObj, field.getName()); // 属性对应的数据 if (typeName.contains("com.zt.life.modules")) { formatWordData(staticFieldValue, wordData, builder); } else { }else { if (field.getType().getName().equals("java.util.List")) { builder.bind(fieldName, new HackLoopTableRenderPolicy()); } else if (staticFieldValue != null) { if (typeName.contains("java.util.Date") && fieldName.contains("Date")) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); staticFieldValue=sdf.format(staticFieldValue); } String valStr = staticFieldValue.toString(); if (valStr.contains("文件图片:")) { valStr = localPath + valStr.replace("文件图片:", ""); @@ -88,6 +93,8 @@ if (wordData.get(fieldName) == null) wordData.put(fieldName, staticFieldValue); } if (wordData.get(fieldName) == null) wordData.put(fieldName, staticFieldValue); } } } modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java
@@ -81,12 +81,12 @@ public List<ItemCirculatOrder> page(QueryFilter queryFilter) { List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams()); if (list.size() > 0) { workflowService.getRunFlow(list, "pzxrk"); workflowService.getRunFlow(list, "wplz"); } return list; } /** /**yi * 删除 * * @param ids modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml
@@ -18,7 +18,7 @@ </select> <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem"> SET @row_number = 0; SELECT (@row_number := @row_number + 1) AS no, SELECT (@row_number := @row_number + 1) AS no, p.secret_class, SUBSTRING(m.name, LOCATE('软件', m.name), LENGTH(m.name)) AS itemName, m.identify AS version, @@ -30,32 +30,35 @@ AND s.id = m.order_id UNION SELECT (@row_number := @row_number + 1) AS no, NULL AS secretClass, '软件测试委托单' AS itemName, NULL AS version, s.code AS itemIdentify NULL AS secretClass, '软件测试委托单' AS itemName, NULL AS version, s.code AS itemIdentify FROM software_test_order s WHERE s.is_delete = 0 AND s.project_id = ${projectId} UNION SELECT (@row_number := @row_number + 1) AS no, NULL AS secretClass, '物品流转单' AS itemName, NULL AS version, i.code AS itemIdentify NULL AS secretClass, '物品流转单' AS itemName, NULL AS version, i.code AS itemIdentify FROM item_circulat_order i WHERE i.is_delete = 0 AND i.project_id = ${projectId} </select> <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem"> select a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id SET @row_number = 0; SELECT (@row_number := @row_number + 1) AS no, a.item_name,a.item_identify,a.version as retrospect_version,a.secret_class,a.project_id,a.id as select_id from config_item_warehouse_detail a WHERE a.is_delete = 0 and a.project_id = ${projectId} and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail) and a.project_id = ${projectId} <if test="ids!=null and ids!=''"> AND id not in (${ids}) AND id not in (${ids}) </if> and a.id NOT IN (SELECT select_id FROM config_item_warehouse_detail WHERE (SELECT count(*) FROM config_item_warehouse_detail WHERE id = select_id) > 0) </select> </mapper> web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue
@@ -28,7 +28,7 @@ </el-date-picker> </el-form-item> <el-form-item class="marginTopAndMarginBottom2" label="库类型" style="width: 99%"> <zt-dict v-model="dataForm.configItemChange.libraryType" :radio="true" dict="library_type"></zt-dict> <zt-dict :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.libraryType" :radio="true" dict="library_type"></zt-dict> </el-form-item> </div> <div class="el-configChangeDialog el-border-bottom"> web/src/views/modules/configItemWarehouse/ConfigItemWarehouse-AddOrUpdate.vue
@@ -28,7 +28,7 @@ </el-date-picker> </el-form-item> <el-form-item class="marginTopAndMarginBottom2" label="库类型" style="width: 99%"> <zt-dict v-model="dataForm.configItemWarehouse.libraryType" :radio="true" dict="library_type"></zt-dict> <zt-dict :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemWarehouse.libraryType" :radio="true" dict="library_type"></zt-dict> </el-form-item> </div> <div class="el-flexManageDialog el-border-bottom"> @@ -88,7 +88,7 @@ <el-table-column fixed="right" prop="files" label="上传附件" width="240" align="center"> <template v-slot="{ row }"> <!-- <zt-table-button @click="files(row.id)">上传附件</zt-table-button>--> <table-uploader busi-type="config_item_warehouse" model-name="row" :dataForm="row" <table-uploader :disabled="!showAddAndEdit" busi-type="config_item_warehouse" model-name="row" :dataForm="row" v-model="row.files"/> </template> </el-table-column> web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -16,16 +16,18 @@ <el-input v-model="dataForm.project.softwareName" placeholder="项目名称"></el-input> </el-form-item> <el-form-item class="marginTopAndMarginBottom3" label="检查人" style="width: 49%"> <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.checkOrder.examiner" <el-input v-if="stepMarker=='csjcd_first'" v-model="dataForm.checkOrder.examiner" placeholder="检查人"></el-input> <span v-else>{{dataForm.checkOrder.examiner}}</span> </el-form-item> <el-form-item class="marginTopAndMarginBottom3" label="检查时间" style="width: 49%"> <el-date-picker :disabled="stepMarker!=='csjcd_first'" v-if="stepMarker=='csjcd_first'" v-model="dataForm.checkOrder.examDate" type="date" placeholder="请选择检查时间"> </el-date-picker> <span v-else>{{dataForm.checkOrder.examDate}}</span> </el-form-item> </div> <div style="border-bottom: 1px solid rgba(0,0,0,.2);"> @@ -47,12 +49,13 @@ </el-table-column> <el-table-column prop="checkResult" align="center" width="180" label="检查结果"> <template v-slot="{ row }"> <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict> <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict> </template> </el-table-column> <el-table-column prop="remark" label="备注" width="100" align="center"> <template v-slot="{ row }"> <el-input v-model="row.remark" placeholder="备注"></el-input> <el-input v-if="stepMarker=='csjcd_first'" v-model="row.remark" placeholder="备注"></el-input> <span v-else>{{row.remark}}</span> </template> </el-table-column> <!-- <el-table-column fixed="right" prop="files" label="上传附件" width="300" align="center"> @@ -76,8 +79,9 @@ </div> <div class="el-border-left acceptDate" style="height: 80px;width: 80%;"> <el-form-item style="width: 100%;padding-left:20px;margin:0;"> <el-input type="textarea" <el-input v-if="stepMarker=='csjcd_first'" type="textarea" :rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="问题描述..."></el-input> <span v-else>{{dataForm.checkOrder.problemDescription}}</span> </el-form-item> </div> </div> @@ -87,8 +91,9 @@ </div> <div class="el-border-left acceptDate" style="height: 80px;width: 80%;"> <el-form-item style="width: 100%;padding-left:20px;margin:0;"> <el-input type="textarea" <el-input v-if="stepMarker=='csjcd_wtcl'" type="textarea" :rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="问题处理..."></el-input> <span v-else>{{dataForm.checkOrder.problemProcess}}</span> </el-form-item> </div> </div> @@ -233,7 +238,10 @@ submitType == '' } } if (submitType == 'tj' || submitType == 'bl') { if (submitType == 'bl') { isFlow = true } if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) { let flowInfo = { flowCode: 'csjcd', stepIdMark: this.stepMarker, @@ -247,6 +255,7 @@ await this.$tip.success() this.$refs.dialog.close() this.$emit('recall', res.data, this.configDetailRow) this.$emit('refreshDataList') } } }
