diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index 9192810a1..ab03ec293 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -237,7 +237,7 @@ public class ProjectLawsInventoryEOController extends JeroController queryProjectLawsInventoryInfoById(@RequestParam Map params) { - ProjectLawsInventoryEO result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); + List result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params); return Result.OK((String) params.get("cut"),result); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java index e94ebd815..97b303aad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java @@ -7,6 +7,7 @@ import com.jero.common.constant.enums.CutEnum; * 审查结果枚举类 */ public enum ReviewResultEnum { + LAUNCH("发起","launch"), TO_BE_CONFIRMED("待确认","to be confirmed"), CONFORMITY("符合","conformity"), INCONFORMITY("不符合","inconformity"), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index cad641f9a..641ec12c1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -89,7 +89,7 @@ public interface IProjectLawsInventoryEOService extends IService processCall(JSONObject jsonObject); - ProjectLawsInventoryEO queryProjectLawsInventoryInfoById(Map params); + List queryProjectLawsInventoryInfoById(Map params); void copyInfoByIds(String ids); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index b756853b2..7beb06b21 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1127,7 +1127,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl params) { + public List queryProjectLawsInventoryInfoById(Map params) { String id = (String) params.get("id"); if(StringUtils.isEmpty(id)){ @@ -1174,7 +1174,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl