导出文件模板修改

application-facade/src/main/java/com/factory/controller/web/FileBlobController.java

@@ -60,9 +60,9 @@ public class FileBlobController {
     }
 
 
-    @GetMapping("/downloadFile")
+    @GetMapping("/downloadFile/{id}")
     @ApiOperation(value = "按id下载附件测试")
-    public void downFile(@RequestParam("id") long id, HttpServletResponse response) throws IOException {
+    public void downFile(@PathVariable("id") long id, HttpServletResponse response) throws IOException {
         download(id, response);
     }
 

application-facade/src/main/java/com/factory/web/entity/fa/FirstArticleItem.java

@@ -103,6 +103,10 @@ public class FirstArticleItem implements Serializable {
     @ApiModelProperty(value = "是否有特殊情况的首件放行记录 0没有 1有")
     private Integer releaseFlag;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "放行记录备注叠加")
+    private String permitDesc;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "任务信息-小程序用")
     private FirstArticleTask firstArticleTask;

application-facade/src/main/java/com/factory/web/mapper/fa/FirstArticleMapper.java

@@ -151,6 +151,8 @@ public interface FirstArticleMapper extends BaseMapper<BentelerPlan> {
      */
     public int getFaItemReleaseCount(@Param("req") SearchFaItemReleaseCountReq req);
 
+    public String getFaItemRelease(@Param("req") SearchFaItemReleaseCountReq req);
+
     /**
      * 取得点检人
      *

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -197,7 +197,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                     .pauseFlag(false)
                     .effectiveDate(req.getEffectiveDate())
                     .status(PlanStatus.WAIT_APPROVAL.value)
-                    .fileId(req.getUrl().intValue())
+                    .fileId(req.getUrl() == null ? req.getUrl().intValue() : null)
                     .build();
             planService.save(plan);
             // 添加首件、200件点检规则
@@ -1186,6 +1186,8 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
                 int count = firstArticleMapper.getFaItemReleaseCount(searchFaItemReleaseCountReq);
                 if (count > 0) {
                     firstArticleItem.setReleaseFlag(1); // 1有
+
+                    firstArticleItem.setPermitDesc(firstArticleMapper.getFaItemRelease(searchFaItemReleaseCountReq)); // 备注
                 } else {
                     firstArticleItem.setReleaseFlag(0); // 0没有
                 }

application-facade/src/main/java/com/factory/wx/service/impl/PlanPassFAServiceImpl.java

@@ -227,8 +227,12 @@ public class PlanPassFAServiceImpl implements PlanPassFAService {
      */
     private boolean updateFirstArticleTask(PlanApprovalTaskReq planApprovalTaskReq) {
         int taskStatus = 0; //task表状态
-        if (planApprovalTaskReq.getStatus() == 1) taskStatus = 2; // 放行
-        if (planApprovalTaskReq.getStatus() == 2) taskStatus = 3; // 不通过
+        if (planApprovalTaskReq.getStatus() == 1) {
+            taskStatus = 2;
+        } // 放行
+        if (planApprovalTaskReq.getStatus() == 2) {
+            taskStatus = 3;
+        } // 不通过
 
         return firstArticleTaskService.updateById(FirstArticleTask.builder()
                 .id(planApprovalTaskReq.getTaskId())

application-facade/src/main/resources/mapper/FirstArticleMapper.xml

@@ -5,8 +5,8 @@
 
     <!--取得首件计划点检列表（审批通过的 首件计划）（计划当天点检状态，plan_status，0未完成 1已完成 2待重检） -->
     <select id="getFaPlanCheckList" resultType="com.factory.web.entity.fa.res.FaPlanListRes">
-       SELECT 
-       temp.benteler_plan_id,temp.benteler_plan_name,temp.created_time,temp.pause_flag,temp.check_person,
+       SELECT
+        temp.benteler_plan_id,temp.benteler_plan_name,temp.created_time,temp.pause_flag,temp.check_person,
        <![CDATA[
        CASE
 		   WHEN temp.count0 > 0 THEN 0
@@ -387,6 +387,19 @@
           AND fair.first_article_item_id = #{req.firstArticleItemId}
           AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
     </select>
+    <!-- 判断当前检查项目是否是放行 -->
+    <select id="getFaItemRelease" resultType="String">
+        SELECT group_concat(faat.reason)
+        FROM first_article_item_result fair,
+             first_article_task fat,
+             first_article_approval_task faat
+        WHERE fair.first_article_task_id = fat.id
+          and faat.first_article_task_id = fat.id
+          AND fat.`status` = 2
+          AND fair.result = 1
+          AND fair.first_article_item_id = #{req.firstArticleItemId}
+          AND DATE_FORMAT(fat.task_time, '%Y-%m-%d') = #{req.checkDate}
+    </select>
 
     <!--取得点检人 -->
     <!--

application-facade/src/main/resources/mapper/PlanPassMapper.xml

@@ -43,11 +43,11 @@
         first_article_calendar oc,
         benteler_plan bp
         WHERE
-        bp.plan_type=1 and bp.status in (4,5)
+        bp.plan_type=1
+        and bp.status in (4,5)
         and rat.first_article_task_id = ot.id
         AND ot.first_article_calendar_id = oc.id
         AND oc.benteler_plan_id = bp.id
-        AND rat.`status` = 0
         AND ot.`status` = 1
         AND rat.`status` = 0
         AND rat.approval_role in