feat: 企标复审计划根据Id查询数据

laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardRecheckPlanController.java

@@ -4,6 +4,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
 import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO;
@@ -13,10 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -52,4 +50,18 @@ public class EnterpriseStandardRecheckPlanController extends JeroController<Ente
 								   @RequestParam(name="pageSize", defaultValue="10") @ApiParam("页面显示数量") Integer pageSize) {
 		return Result.OK(recheckPlanService.queryPageList(esDeclare, pageNo, pageSize));
 	}
+
+	/**
+	 * 根据Id查询
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "企标复审计划-根据Id查询")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value="企标复审计划-根据Id查询", notes="企标复审计划-根据Id查询")
+	@GetMapping(value = "/getById/{id}")
+	@Translation
+	public Result<?> getDataById(@PathVariable("id") @ApiParam("复审计划主键ID") String id) {
+		return Result.OK(recheckPlanService.getDataById(id));
+	}
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardRecheckPlanVo.java

@@ -40,6 +40,12 @@ public class EnterpriseStandardRecheckPlanVo {
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
+    /**实施日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实施日期")
+    private Date implementationDate;
+
     /**复审日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")

laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardRecheckPlanMapper.xml

@@ -32,7 +32,8 @@
             p.recheck_date AS recheckDate,
             p.recheck_result AS recheckResult,
             s.main_drafting_user AS mainDraftingUser,
-            s.main_drafting_unit AS mainDraftingUnit
+            s.main_drafting_unit AS mainDraftingUnit,
+            s.implementation_date AS implementationDate
         FROM
             laws_enterprise_standard_recheck_plan AS p
                 LEFT JOIN laws_enterprise_standard AS s ON s.id = p.standard_id
@@ -53,6 +54,12 @@
             <if test="param.recheckStartDate != null and param.recheckEndDate != null">
                 AND p.recheck_date BETWEEN #{param.recheckStartDate} AND #{param.recheckEndDate}
             </if>
+            <if test="param.idList != null and param.idList.size() > 0">
+                AND p.id IN
+                <foreach item="item" index="index" collection="param.idList" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         ORDER BY
             p.create_time DESC
     </select>

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardRecheckPlanService.java

@@ -22,4 +22,6 @@ public interface EnterpriseStandardRecheckPlanService extends IService<Enterpris
      * @return
      */
     IPage<EnterpriseStandardRecheckPlanVo> queryPageList(ESQueryCommonDTO esRecheckPlan, Integer pageNo, Integer pageSize);
+
+    EnterpriseStandardRecheckPlanVo getDataById(String id);
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardRecheckPlanServiceImpl.java

@@ -18,21 +18,19 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.Calendar;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
-* @author ThinkBook
+ * @author ThinkBook
-* @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现
+ * @description 针对表【laws_enterprise_standard_recheck_plan】的数据库操作Service实现
-* @createDate 2023-09-07 11:20:19
+ * @createDate 2023-09-07 11:20:19
-*/
+ */
 @Service
 @Transactional(rollbackFor = JeroBootException.class)
 @Slf4j
 public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<EnterpriseStandardRecheckPlanMapper, EnterpriseStandardRecheckPlan>
-    implements EnterpriseStandardRecheckPlanService{
+        implements EnterpriseStandardRecheckPlanService {
 
     @Resource
     private EnterpriseStandardRecheckPlanMapper esRecheckPlanMapper;
@@ -59,6 +57,18 @@ public class EnterpriseStandardRecheckPlanServiceImpl extends ServiceImpl<Enterp
         });
         return page.setRecords(records);
     }
+
+    @Override
+    public EnterpriseStandardRecheckPlanVo getDataById(String id) {
+        List<String> idList = new ArrayList<>(Collections.singletonList(id));
+        ESQueryCommonDTO esQueryCommonDTO = new ESQueryCommonDTO();
+        esQueryCommonDTO.setIdList(idList);
+        List<EnterpriseStandardRecheckPlanVo> records = this.queryPageList(esQueryCommonDTO, 1, Integer.MAX_VALUE).getRecords();
+        if (!records.isEmpty()) {
+            return records.get(0);
+        }
+        return null;
+    }
 }