厂商管理增加字段、以及对应接口修改

quality-review/src/main/java/com/ruoyi/domain/AutomobileEnterprise.java

@@ -58,4 +58,9 @@ public class AutomobileEnterprise extends BaseEntity
     @Excel(name = "联系电话")
     @ApiModelProperty("联系电话")
     private String contactNumber;
+
+    /** 联系电话 */
+    @Excel(name = "企业类型")
+    @ApiModelProperty("企业类型")
+    private String enterpriseType;
 }

quality-review/src/main/java/com/ruoyi/mapper/ReviewKeyPointMapper.java

@@ -25,5 +25,5 @@ public interface ReviewKeyPointMapper extends BaseMapper<ReviewKeyPoint> {
 
     List<ReviewKeyPointListResponse> getKeyPointList(@Param("standardId") Long standardId);
 
-    List<ReviewDetailsListResponse> getDetailsList(@Param("keyPointId") Long keyPointId);
+    List<ReviewDetailsListResponse> getDetailsList(@Param("keypointId") Long keypointId);
 }

quality-review/src/main/java/com/ruoyi/service/ReviewSceneChangeTaskService.java

@@ -113,6 +113,6 @@ public interface ReviewSceneChangeTaskService extends IService<ReviewSceneChange
     /*
      * 发起评审-新增审查场景-获取细则列表
      * */
-    List<ReviewDetailsListResponse> getDetailsList(Long keyPointId);
+    List<ReviewDetailsListResponse> getDetailsList(Long keypointId);
 
 }

quality-review/src/main/java/com/ruoyi/service/impl/ReviewSceneChangeTaskServiceImpl.java

@@ -494,8 +494,8 @@ public class ReviewSceneChangeTaskServiceImpl extends ServiceImpl<ReviewSceneCha
      * 发起评审-新增审查场景-获取细则列表
      * */
     @Override
-    public List<ReviewDetailsListResponse> getDetailsList(Long keyPointId) {
-        return reviewKeyPointMapper.getDetailsList(keyPointId);
+    public List<ReviewDetailsListResponse> getDetailsList(Long keypointId) {
+        return reviewKeyPointMapper.getDetailsList(keypointId);
     }
 }
 

quality-review/src/main/java/com/ruoyi/service/impl/StrategyCarReviewTaskNew.java

@@ -42,6 +42,7 @@ public class StrategyCarReviewTaskNew implements StrategyCarReviewTask, Initiali
     @Override
     public CarReviewTaskViewResponse doView(CarReviewTask carReviewTask) {
         // 获取最新问卷
+        // TODO 从新系统获取
         List<ReviewStandard> standardTree = reviewStandardService.findTree(carReviewTask.getStandardId(), ReviewStandard.TYPE_CAR);
 
         // 将问卷赋值到任务

quality-review/src/main/java/com/ruoyi/web/ReviewSceneChangeTaskController.java

@@ -175,7 +175,8 @@ public class ReviewSceneChangeTaskController extends BaseController {
     @Log(title = "发起评审-新增审查场景-获取要点列表", businessType = BusinessType.UPDATE)
     @RequestMapping(method = RequestMethod.POST, value = "/getKeyPointList")
     public R<List<ReviewKeyPointListResponse>> getKeyPointList(@Validated @RequestBody ReviewKeyPointListRequest request){
-        List<ReviewKeyPointListResponse> list = reviewSceneChangeTaskService.getKeyPointList(request.getStandardId());
+        Long id = Long.parseLong(request.getStandardId());
+        List<ReviewKeyPointListResponse> list = reviewSceneChangeTaskService.getKeyPointList(id);
         return R.ok(list);
     }
 
@@ -188,7 +189,8 @@ public class ReviewSceneChangeTaskController extends BaseController {
     @Log(title = "发起评审-新增审查场景-获取细则列表", businessType = BusinessType.UPDATE)
     @RequestMapping(method = RequestMethod.POST, value = "/getDetailsList")
     public R<List<ReviewDetailsListResponse>> getKeyPointList(@Validated @RequestBody ReviewDetailsListRequest request){
-        List<ReviewDetailsListResponse> list = reviewSceneChangeTaskService.getDetailsList(request.getKeyPointId());
+        Long id = Long.parseLong(request.getKeypointId());
+        List<ReviewDetailsListResponse> list = reviewSceneChangeTaskService.getDetailsList(id);
         return R.ok(list);
     }
 

quality-review/src/main/java/com/ruoyi/web/request/AutomobileEnterpriseListRequest.java

@@ -33,4 +33,8 @@ public class AutomobileEnterpriseListRequest extends PageDomain {
     @ApiModelProperty("联系电话")
     private String contactNumber;
 
+    /*厂商企业类型*/
+    @ApiModelProperty
+    private String enterpriseType;
+
 }

quality-review/src/main/java/com/ruoyi/web/request/ReviewDetailsListRequest.java

@@ -9,5 +9,5 @@ import lombok.Data;
 public class ReviewDetailsListRequest {
 
     @ApiModelProperty("标准要求id")
-    private Long keyPointId;
+    private String keypointId;
 }

quality-review/src/main/java/com/ruoyi/web/request/ReviewKeyPointListRequest.java

@@ -9,5 +9,5 @@ import lombok.Data;
 public class ReviewKeyPointListRequest {
 
     @ApiModelProperty("标准要求id")
-    private Long standardId;
+    private String standardId;
 }

quality-review/src/main/java/com/ruoyi/web/response/ReviewDetailsListResponse.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class ReviewDetailsListResponse {
 
     @ApiModelProperty("主键-要点id")
-    private Long id;
+    private String id;
 
     @ApiModelProperty("要点文本内容")
     private String text;

quality-review/src/main/java/com/ruoyi/web/response/ReviewKeyPointListResponse.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class ReviewKeyPointListResponse {
 
     @ApiModelProperty("主键-要点id")
-    private Long id;
+    private String id;
 
     @ApiModelProperty("要点文本内容")
     private String text;

quality-review/src/main/resources/mapper/AutomobileEnterpriseMapper.xml

@@ -29,7 +29,8 @@
                create_time,
                update_by,
                update_time,
-               deleted
+               deleted,
+               enterprise_type
         from t_automobile_enterprise
     </sql>
 
@@ -44,7 +45,8 @@
                ae.create_time,
                ae.update_by,
                ae.update_time,
-               ae.deleted
+               ae.deleted,
+               ae.enterprise_type
         from t_automobile_enterprise ae
         left join sys_user su on ae.create_by = su.user_id
     </sql>
@@ -62,6 +64,9 @@
             <if test="enterpriseContact != null  and enterpriseContact != ''">
                 and ae.enterprise_contact like concat('%', #{enterpriseContact}, '%')
             </if>
+            <if test="enterpriseType != null  and enterpriseType != ''">
+                and ae.enterprise_type like concat('%', #{enterpriseType}, '%')
+            </if>
             <if test="contactNumber != null  and contactNumber != ''">and ae.contact_number like concat('%', #{contactNumber}, '%')</if>
         </where>
     </select>
@@ -111,6 +116,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="enterpriseType != null">enterprise_Type = #{enterpriseType}</if>
         </trim>
         where id = #{id}
     </update>

quality-review/src/main/resources/mapper/ReviewKeyPointMapper.xml

@@ -32,7 +32,7 @@
     </select>
     <select id="getDetailsList" resultType="com.ruoyi.web.response.ReviewDetailsListResponse">
         select id, text from t_review_details
-        where review_keypoint_id = #{keyPointId}
+        where review_keypoint_id = #{keypointId}
     </select>
 
 </mapper>

ruoyi-admin/src/test/java/com/ruoyi/TestUrl.java

@@ -29,6 +29,7 @@ public class TestUrl {
                 .url("http://10.12.48.80:8089/api/query")
                 .method("POST", body)
                 .addHeader("Content-Type", "application/json")
+                .addHeader("Authorization", "Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjAsInRva2VuaWQiOjYxLCJ0eXBlIjoiYXBpIiwidXNlcm5hbWUiOiJhZG1pbiJ9.48Ggjx-FtOcecf73vAHn0XglwgLXZlfXxhXiLDHWWQE")
 //                .addHeader("Host", "10.12.48.80:8089")
 //                .addHeader("Origin", "http://10.12.48.80:8089")
 //                .addHeader("Referer", "http://10.12.48.80:8089/api/graphql/playground")
@@ -44,5 +45,5 @@ public class TestUrl {
         });
 
     }
-    
+
 }