1.根据模板类型查找文书

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

@@ -212,4 +212,4 @@ archive:
 assistmg:
   profile: /home/eip/uploadPath
   imgUrl: http://1.71.9.215:9506
-  #  imgUrl: http://127.0.0.1:9506
+  #   imgUrl: http://127.0.0.1:9506

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

@@ -46,4 +46,6 @@ public interface CostDocumentTemplateManager extends BaseManager<CostDocumentTem
 	void deleteByIds(List<String> ids);
 
 	CostDocumentTemplate getByAlias(String sdhz);
+
+	CostDocumentTemplate getByDocument(String number);
 }

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

@@ -91,13 +91,18 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 	@Override
 	@ Transactional(rollbackFor = Exception.class)
 	public String create(CostDocumentTemplateReq entityReq) {
-		LambdaQueryWrapper<CostDocumentTemplate> queryWrapper = new LambdaQueryWrapper<>();
-		queryWrapper.eq(CostDocumentTemplate::getDocumentName, entityReq.getDocumentName());
-		CostDocumentTemplate costDocumentTemplate = this.getOne(queryWrapper, false);
+		QueryWrapper<CostDocumentTemplate> wrapper = new QueryWrapper<>();
+		wrapper.eq("document_type",entityReq.getDocumentType());
+		CostDocumentTemplate one = this.getOne(wrapper);
+		if (one!=null) {
+			throw new BaseException("当前文书类型已有绑定："+one.getDocumentName());
+		}
 		IUser user = ContextUtil.getCurrentUser();
 		entityReq.setCreateBy(user.getAccount());
 		entityReq.setCreateTime(LocalDateTime.now());
-
+		LambdaQueryWrapper<CostDocumentTemplate> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(CostDocumentTemplate::getDocumentName, entityReq.getDocumentName());
+		CostDocumentTemplate costDocumentTemplate = this.getOne(queryWrapper, false);
 		CostDocumentTemplate entity = BeanUtil.copyProperties(entityReq, CostDocumentTemplate.class);
 		if(costDocumentTemplate== null ){
 			entity.setIsDeleted(BaseConstant.NORMAL_STATUS);
@@ -191,6 +196,13 @@ public class CostDocumentTemplateManagerImpl extends BaseManagerImpl<CostDocumen
 		return this.getOne(wrapper);
 	}
 
+	@Override
+	public CostDocumentTemplate getByDocument(String number) {
+		QueryWrapper<CostDocumentTemplate> wrapper = new QueryWrapper<>();
+		wrapper.eq("document_type",number);
+		return this.getOne(wrapper);
+	}
+
 
 	@Override
 	public void update(CostDocumentTemplate entity) {

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

@@ -268,7 +268,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
         costProjectDocument.setDocumentNumber(whNo);
         costProjectDocument.setDocumentName(costDocumentTemplate.getDocumentName());
         costProjectDocument.setCreateBy(user.getCreateBy());
-        costProjectDocument.setDocumentType(costDocumentTemplate.getType());
+        //costProjectDocument.setDocumentType(costDocumentTemplate.getType());
         costProjectDocument.setProjectId(costProjectApproval.getProjectId());
         super.create(costProjectDocument);
 
@@ -285,10 +285,10 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
             if (StringUtils.isNotBlank(costProjectDocumentFile.getTableName()) && StringUtil.isEmpty(costProjectDocumentFile.getDataValue())){
                 if(StringUtil.isEmpty(costProjectDocumentFile.getWhereValue()) && StringUtil.isNotEmpty(costProjectDocumentFile.getWhereName())){
                     costProjectDocumentFile.setWhereValue(costProjectApproval.getProjectId());
-                } else if (costProjectDocument.getDocumentAlias().equals("cbjsgzdg")
-                        &&!costProjectDocument.getDocumentAlias().equals("cbjsjtsyjl")
-                        &&!costProjectDocument.getDocumentAlias().equals("cbshcbyjb1")
-                        &&!costProjectDocument.getDocumentAlias().equals("cbjstqzldjb")) {
+                } else if (costProjectDocument.getDocumentType().equals("8")
+                        &&!costProjectDocument.getDocumentType().equals("7")
+                        &&!costProjectDocument.getDocumentType().equals("6")
+                        &&!costProjectDocument.getDocumentType().equals("9")) {
                     String whereValue1 = costProjectDocumentFile.getWhereValue();
                     String replace = whereValue1.replace("?", "'" + costProjectApproval.getProjectId() + "'");
                     String replaced = replace.replace("&", auditedUnit.getUnitId());
@@ -322,7 +322,8 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 
         if (costDocumentTemplate.getIsWh().equals("0")) {
 
-            CostDocumentTemplate templateManagerById = costDocumentTemplateManager.getByAlias("sdhz");
+            //CostDocumentTemplate templateManagerById = costDocumentTemplateManager.getByAlias("sdhz");
+            CostDocumentTemplate templateManagerById = costDocumentTemplateManager.getByDocument("12");
             if (templateManagerById==null) {
                 throw new BaseException("未查询到送达回证文书模板信息，请先添加");
             }
@@ -342,8 +343,9 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                 projectDocument.setDocumentWhId(costDocumentWh.getId());
             }
             projectDocument.setDocumentId(String.valueOf(templateManagerById.getId()));
-            projectDocument.setDocumentName(costProjectDocument.getDocumentName()+"-"+templateManagerById.getDocumentName());
-            projectDocument.setDocumentType(templateManagerById.getType());
+            projectDocument.setDocumentName(costProjectDocument.getDocumentName()+"-"+templateManagerById.getDocumentTypeName());
+            projectDocument.setDocumentType(templateManagerById.getDocumentType());
+            projectDocument.setDocumentTypeName("送达回证");
             projectDocument.setDocumentAlias(templateManagerById.getAlias());
             //super.create(projectDocument);
             this.save(projectDocument);
@@ -577,7 +579,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
                  FileOutputStream fos = FileUtils.createFileOutputStream(outputPath);) {
 
 
-                if (costProjectDocument.getDocumentAlias().equals("cbjstqzldjb")) {
+                if (costProjectDocument.getDocumentType().equals("9")) {
                     List<CostProjectTaskEvidence> costProjectTaskEvidences= costProjectTaskEvidenceManager.findEvidenceListByTaskIds(costProjectDocument.getProjectId(),costProjectDocument.getEnterpriseId());
                     if (!costProjectTaskEvidences.isEmpty()) {
                         List<CompleteTemplateProcessor.TableRowData> mapList = costProjectTaskEvidences.stream().map(c -> {
@@ -592,7 +594,7 @@ public class CostProjectDocumentManagerImpl extends BaseManagerImpl<CostProjectD
 
                         CompleteTemplateProcessor.processTemplateComplete(document,auditedUnit.getUnitName(),mapList,DateUtils.format(new Date(),ISO8601_DATE_PATTERN));
                     }
-                } else if (costProjectDocument.getDocumentAlias().equals("zfdjcbjsjlbg")) {
+                } else if (costProjectDocument.getDocumentType().equals("3")) {
                     CostProjectApproval costProjectApproval = costProjectApprovalManager.get(costProjectDocument.getProjectId());
 
                     List<CostProjectTask> taskByProjectId = costProjectTaskManager.findTaskByProjectId(costProjectApproval.getProjectId(), costProjectDocument.getEnterpriseId());

assistMg/src/main/java/com/hotent/project/model/CostProjectDocument.java

@@ -49,6 +49,11 @@ public class CostProjectDocument extends BaseModel<CostProjectDocument> {
     @JsonProperty("documentType")
     private String documentType;
 
+    @ApiModelProperty(value = "关联文书类型名称")
+    @TableField("document_type_name")
+    @JsonProperty("documentTypeName")
+    private String documentTypeName;
+
 
     @ApiModelProperty(value = "文书别名")
     @TableField("document_alias")
@@ -156,6 +161,15 @@ public class CostProjectDocument extends BaseModel<CostProjectDocument> {
     public void setDocumentType(String documentType) {
         this.documentType = documentType;
     }
+
+
+    public String getDocumentTypeName() {
+        return documentTypeName;
+    }
+
+    public void setDocumentTypeName(String documentTypeName) {
+        this.documentTypeName = documentTypeName;
+    }
     
 
     public String getId() {

assistMg/src/main/java/com/hotent/project/req/CostProjectDocumentReq.java

@@ -43,6 +43,13 @@ public class CostProjectDocumentReq extends BaseModel<CostProjectDocumentReq> {
     @JsonProperty("documentAlias")
     private String documentAlias;
 
+    @ApiModelProperty(value = "")
+    @JsonProperty("documentType")
+    private String documentType;
+
+    @ApiModelProperty(value = "")
+    @JsonProperty("documentTypeName")
+    private String documentTypeName;
 
     @ApiModelProperty(value = "文书文号id")
     @JsonProperty("documentWhId")
@@ -156,6 +163,24 @@ public class CostProjectDocumentReq extends BaseModel<CostProjectDocumentReq> {
         this.documentAlias = documentAlias;
     }
 
+
+    public String getDocumentType() {
+        return documentType;
+    }
+
+    public void setDocumentType(String documentType) {
+        this.documentType = documentType;
+    }
+
+
+    public String getDocumentTypeName() {
+        return documentTypeName;
+    }
+
+    public void setDocumentTypeName(String documentTypeName) {
+        this.documentTypeName = documentTypeName;
+    }
+
     
 
     public void setDocumentId(String documentId) {

assistMg/src/main/resources/mapper/CostProjectDocumentMapper.xml

@@ -9,6 +9,7 @@
         <result column="document_id" property="documentId"/>
         <result column="document_name" property="documentName"/>
         <result column="document_type" property="documentType"/>
+        <result column="document_type_name" property="documentTypeName"/>
         <result column="document_number" property="documentNumber"/>
         <result column="document_wh_id" property="documentWhId"/>
         <result column="document_alias" property="documentAlias"/>
@@ -31,7 +32,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id
-        , project_id, document_id,document_name,document_type,document_alias,document_number,document_wh_id, enterprise_id, generate_time, electronic_document_url, scan_document_url, feedback_document_url, is_pushed, push_time, feedback_time, is_deleted, create_time, create_by, update_time, update_by, order_num
+        , project_id, document_id,document_name,document_type,document_type_name,document_alias,document_number,document_wh_id, enterprise_id, generate_time, electronic_document_url, scan_document_url, feedback_document_url, is_pushed, push_time, feedback_time, is_deleted, create_time, create_by, update_time, update_by, order_num
     </sql>
 
     <select id="selectPage" resultMap="BaseResultMap">