Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/controller/ProofreadInfoController.java

@@ -41,8 +41,8 @@ public class ProofreadInfoController {
      */
     @ApiOperation(value = "根据项目id查询")
     @GetMapping("/findById")
-    public ResponseEntity<ProofreadInfoDto> findById(String id) {
-        ProofreadInfoDto info = service.findById(id);
+    public ResponseEntity<ProofreadInfoDto> findById(String id, String type) {
+        ProofreadInfoDto info = service.findById(id, type);
         return ResponseEntity.ok(info);
     }
 

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/domain/ProofreadInfo.java

@@ -11,6 +11,11 @@ import java.util.Date;
 public class ProofreadInfo extends BaseEntity {
 
     /**
+     * 类型
+     */
+    private String type;
+
+    /**
      * 项目id
      */
     private String projectId;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/ProofreadInfoMapper.java

@@ -7,6 +7,6 @@ import org.apache.ibatis.annotations.Param;
 
 public interface ProofreadInfoMapper extends BaseMapper<ProofreadInfo> {
 
-    ProofreadInfoDto findByProjectId(@Param("id") String id);
+    ProofreadInfoDto findByProjectId(@Param("id") String id, @Param("type") String type);
 
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/mapper/xml/ProofreadInfoMapper.xml

@@ -10,6 +10,7 @@
 			a.update_by,
 			a.update_date,
 			a.del_flag,
+			a.type,
 			a.project_id,
 			b.`name` AS project_name,
 			b.assessment_date,
@@ -25,6 +26,7 @@
 		WHERE
 			a.del_flag = 0
 			AND a.project_id = #{id}
+			AND a.type = #{type}
 	</select>
 
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/service/ProofreadInfoService.java

@@ -32,6 +32,7 @@ public class ProofreadInfoService {
             LambdaQueryWrapper<ProofreadInfo> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(ProofreadInfo::getProjectId, dto.getProjectId());
             wrapper.eq(ProofreadInfo::getDelFlag, 0);
+            wrapper.eq(ProofreadInfo::getType, dto.getType());
             ProofreadInfo proofreadInfo = infoMapper.selectOne(wrapper);
             if (proofreadInfo != null) {
                 update(dto);
@@ -82,6 +83,7 @@ public class ProofreadInfoService {
         info.setUpdateDate(new Date());
         LambdaQueryWrapper<ProofreadInfo> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProofreadInfo::getProjectId, dto.getProjectId());
+        wrapper.eq(ProofreadInfo::getType, dto.getType());
         infoMapper.update(info, wrapper);
         //明细表相关信息修改
         if (CollectionUtils.isNotEmpty(dto.getDetails())) {
@@ -94,9 +96,9 @@ public class ProofreadInfoService {
         return dto.getProjectId();
     }
 
-    public ProofreadInfoDto findById(String id) {
+    public ProofreadInfoDto findById(String id, String type) {
         //查询基本信息
-        ProofreadInfoDto dto = infoMapper.findByProjectId(id);
+        ProofreadInfoDto dto = infoMapper.findByProjectId(id, type);
         if (dto != null) {
             //查询扩展信息
             List<ProofreadDetail> details = detailMapper.findByInfoId(dto.getId());

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/proofread/service/dto/ProofreadInfoDto.java

@@ -14,6 +14,11 @@ import java.util.List;
 public class ProofreadInfoDto extends BaseEntity {
 
     /**
+     * 类型
+     */
+    private String type;
+
+    /**
      * 项目id
      */
     private String projectId;