bug相关

assembly/src/main/resources/application-dev.yml

@@ -198,4 +198,4 @@ third:
 
 assistmg:
   profile: /home/eip/uploadPath
-  imgUrl: http://1116.204.108.139:9056
+  imgUrl: http://116.204.117.33:9056

assistMg/src/main/java/com/hotent/baseInfo/controller/CostDocumentTemplateFileController.java

@@ -73,4 +73,16 @@ public class CostDocumentTemplateFileController extends BaseController<CostDocum
 		return CommonResult.<List<CostDocumentTemplateFile>>ok().value(costDocumentTemplateFiles);
 
 	}
+
+	//根据文书id查询和wherename拿dataValue
+	@GetMapping(value="/queryByDocumentIdandWhereValue")
+	@ApiOperation(value = "根据文书id查询和whereValue查询", httpMethod = "GET", notes = "根据文书id查询和whereValue查询")
+	public CommonResult<List<CostDocumentTemplateFile>> queryByDocumentIdandWhereValue(
+			@ApiParam(name="documentId",value="文书id", required = true)@RequestParam() String documentId,
+			@ApiParam(name="whereValue",value="条件值", required = true)@RequestParam() String whereValue
+	) throws Exception{
+		List<CostDocumentTemplateFile> costDocumentTemplateFiles = costDocumentTemplateFileManager.queryByDocumentId(documentId,whereValue);
+		return CommonResult.<List<CostDocumentTemplateFile>>ok().value(costDocumentTemplateFiles);
+
+	}
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/CostDocumentTemplateFileManager.java

@@ -28,7 +28,7 @@ public interface CostDocumentTemplateFileManager extends BaseManager<CostDocumen
 	void createOrUpdate(CostDocumentTemplateFile costDocumentTemplateFile);
 
 
-	public List<CostDocumentTemplateFile> queryByDocumentId(String documentId);
+	public List<CostDocumentTemplateFile> queryByDocumentId(String documentId,String whereValue);
 
 	List<CostDocumentTemplateFile> getDocumentFileList(String documentId);
 }

assistMg/src/main/java/com/hotent/baseInfo/manager/impl/CostDocumentTemplateFileManagerImpl.java

@@ -49,13 +49,13 @@ public class CostDocumentTemplateFileManagerImpl extends BaseManagerImpl<CostDoc
 
 
     @Override
-    public List<CostDocumentTemplateFile> queryByDocumentId(String documentId) {
+    public List<CostDocumentTemplateFile> queryByDocumentId(String documentId,String whereValue) {
         List<CostDocumentTemplateFile> documentFileList = this.getDocumentFileList(documentId);
         QueryWrapper<CostDocumentTemplateFile> eq = new QueryWrapper<CostDocumentTemplateFile>().eq("document_id", documentId);
         for (CostDocumentTemplateFile costProjectDocumentFile : documentFileList) {
             try {
                 //获取whereValue字段值
-                costProjectDocumentFile.setDataValue(this.baseMapper.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereName(), costProjectDocumentFile.getWhereValue()));
+                costProjectDocumentFile.setDataValue(this.baseMapper.getColValue(costProjectDocumentFile.getTableName(), costProjectDocumentFile.getColName(), costProjectDocumentFile.getWhereValue(),whereValue));
             } catch (Exception e) {
                 throw new BaseException("获取字段失败:" + costProjectDocumentFile.getColName());
             }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectApprovalManagerImpl.java

@@ -269,8 +269,8 @@ public class CostProjectApprovalManagerImpl extends BaseManagerImpl<CostProjectA
         CostProjectTaskProccess taskProccess = costProjectTaskProccessManager.getOne(
                 new QueryWrapper<CostProjectTaskProccess>().eq("project_id", costProjectApproval.getProjectId())
         );
-        detailResp.setPlannedAuditStartDate(taskProccess.getPlannedAuditStartDate());
-        detailResp.setPlannedAuditEndDate(taskProccess.getPlannedAuditEndDate());
+        detailResp.setPlannedAuditStartDate(taskProccess!=null?taskProccess.getPlannedAuditStartDate():null);
+        detailResp.setPlannedAuditEndDate(taskProccess!=null?taskProccess.getPlannedAuditEndDate():null);
         return detailResp;
 
     }