Merge branch 'develop' of http://git.mmcuav.cn/iuav/ims into develop

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/IndustryCaseVO.java

@@ -22,15 +22,15 @@ public class IndustryCaseVO implements Serializable {
     @ApiModelProperty(value = "id")
     private Integer id;
     @ApiModelProperty(value = "案例标题")
-    private String newsTitle;
+    private String caseTitle;
     @ApiModelProperty(value = "作者")
-    private String newsAuthor;
+    private String caseAuthor;
     @ApiModelProperty(value = "发布者id")
     private Integer userAccountId;
     @ApiModelProperty(value = "封面图")
     private String surfaceImg;
     @ApiModelProperty(value = "案例内容")
-    private String newsContents;
+    private String caseContents;
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
     @ApiModelProperty(value = "最新修改时间")

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/RequirementsInfoVO.java

@@ -25,9 +25,18 @@ public class RequirementsInfoVO implements Serializable {
     @ApiModelProperty(value = "id")
     @NotNull(message = "id不能为空", groups = {Update.class})
     private Integer id;
+    @ApiModelProperty(value = "省份编码", required = false)
+    @NotNull(message = "省份编码不能为空", groups = {Insert.class})
+    private Integer provinceCode;
+    @ApiModelProperty(value = "市编码", required = false)
+    private Integer cityCode;
+    @ApiModelProperty(value = "区编码", required = false)
+    private Integer districtCode;
     @ApiModelProperty(value = "需求类型id")
     @NotNull(message = "需求类型id不能为空", groups = {Insert.class})
     private Integer requirementTypeId;
+    @ApiModelProperty(value = "需求类型名称")
+    private String requirementTypeName;
     @ApiModelProperty(value = "用户id")
     @NotNull(message = "用户id不能为空", groups = {Insert.class})
     private Integer userAccountId;

release-service/src/main/java/com/mmc/csf/release/controller/IndustryNewsController.java

@@ -32,7 +32,7 @@ public class IndustryNewsController {
         return industryNewsService.listNewsPage(industryCaseQO);
     }
 
-    @ApiOperation(value = "案例详情")
+    @ApiOperation(value = "新闻详情")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryNewsVO.class) })
     @GetMapping("details")
     public ResultBody details(@RequestParam Integer id){

release-service/src/main/java/com/mmc/csf/release/entity/IndustryCaseDO.java

@@ -29,17 +29,17 @@ public class IndustryCaseDO implements Serializable {
     private Date updateTime;
 
     public IndustryCaseVO buildIndustryCaseVO(){
-        return IndustryCaseVO.builder().id(id).newsTitle(caseTitle).newsAuthor(caseAuthor).userAccountId(userAccountId).surfaceImg(surfaceImg).
-                newsContents(caseContents).createTime(createTime).updateTime(updateTime).build();
+        return IndustryCaseVO.builder().id(id).caseTitle(caseTitle).caseAuthor(caseAuthor).userAccountId(userAccountId).surfaceImg(surfaceImg).
+                caseContents(caseContents).createTime(createTime).updateTime(updateTime).build();
     }
 
     public IndustryCaseDO(IndustryCaseVO industryCaseVO){
         this.id = industryCaseVO.getId();
-        this.caseTitle = industryCaseVO.getNewsTitle();
-        this.caseAuthor = industryCaseVO.getNewsAuthor();
+        this.caseTitle = industryCaseVO.getCaseTitle();
+        this.caseAuthor = industryCaseVO.getCaseAuthor();
         this.userAccountId = industryCaseVO.getUserAccountId();
         this.surfaceImg = industryCaseVO.getSurfaceImg();
-        this.caseContents = industryCaseVO.getNewsContents();
+        this.caseContents = industryCaseVO.getCaseContents();
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/entity/RequirementsInfoDO.java

 package com.mmc.csf.release.entity;
 
 import com.mmc.csf.infomation.vo.RequirementsInfoVO;
+import com.mmc.csf.release.model.group.Insert;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,6 +23,9 @@ public class RequirementsInfoDO implements Serializable {
     private Integer id;
     private Integer requirementTypeId;
     private Integer userAccountId;
+    private Integer provinceCode;
+    private Integer cityCode;
+    private Integer districtCode;
     private String publishName;
     private String publishPhone;
     private String requireDescription;
@@ -40,6 +46,9 @@ public class RequirementsInfoDO implements Serializable {
         this.publishName = requirementsInfoVO.getPublishName();
         this.publishPhone = requirementsInfoVO.getPublishPhone();
         this.requireDescription = requirementsInfoVO.getRequireDescription();
+        this.provinceCode = requirementsInfoVO.getProvinceCode();
+        this.cityCode = requirementsInfoVO.getCityCode();
+        this.districtCode = requirementsInfoVO.getDistrictCode();
     }
 
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -75,6 +76,10 @@ public class RequirementsServiceImpl implements RequirementsService {
         industryCaseQO.buildCurrentPage();
         List<RequirementsInfoDO> requirementsInfoDOList = requirementsDao.listPublishPage(industryCaseQO);
         List<RequirementsInfoVO> requirementsInfoVOS = requirementsInfoDOList.stream().map(RequirementsInfoDO::buildRequirementsInfoVO).collect(Collectors.toList());
+        Map<Integer, String> collect = requirementsDao.listType().stream().collect(Collectors.toMap(RequirementsTypeDO::getId, d -> d.getTypeName()));
+        for (RequirementsInfoVO requirementsInfoVO : requirementsInfoVOS) {
+            requirementsInfoVO.setRequirementTypeName(collect.get(requirementsInfoVO.getRequirementTypeId()));
+        }
         return ResultBody.success(PageResult.buildPage(pageNo, industryCaseQO.getPageSize(), count, requirementsInfoVOS));
     }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/TenderServiceImpl.java

@@ -297,6 +297,8 @@ public class TenderServiceImpl implements TenderService {
             pageList.forEach(d->{
                 if(applyTenderInfoIds.contains(d.getId())){
                     d.setApply(1);
+                }else {
+                    d.setApply(0);
                 }
             });
         }

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -6,8 +6,8 @@
 
     <insert id="addRequirementsInfo" parameterType="com.mmc.csf.release.entity.RequirementsInfoDO"
     keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO `iuav_ims`.`requirements_info`(`requirement_type_id`, `user_account_id`, `publish_name`, `publish_phone`, `require_description`, `create_time`)
-        VALUES (#{requirementTypeId}, #{userAccountId}, #{publishName}, #{publishPhone}, #{requireDescription}, NOW());
+        INSERT INTO `iuav_ims`.`requirements_info`(`requirement_type_id`, `user_account_id`, `publish_name`, `publish_phone`, `require_description`, `province_code`, `city_code`, `district_code`, `create_time`)
+        VALUES (#{requirementTypeId}, #{userAccountId}, #{publishName}, #{publishPhone}, #{requireDescription}, #{provinceCode}, #{cityCode}, #{districtCode}, NOW());
     </insert>
 
     <update id="solveRequire">