立项、验收、结项功能添加 11.7

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/project/controller/ProjectController.java

@@ -122,20 +122,11 @@ public class ProjectController extends JeecgController<Project, IProjectService>
     }
 
     /**
-     * @description: //('科技主管部门待提交', '1');
+     * @description: 申报列表，不同角色可见数据
-     * //('科技主管部门已提交', '2');
-     * //('不受理', '3');
-     * //('已受理', '4');
-     * //('申请人待提交', '5');
-     * //('申请单位待提交', '6');
-     * //('市科技局待提交', '7');
-     * //('市科技局已提交', '8');
-     * //('财政主管理部门待审核', '9');
-     * //('财政主管理部门审核通过', '10');
      * @param: [project, pageNo, pageSize, req]
      * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.demo.project.entity.Project>>
      * @author: z.h.c
-     * @date: 24/11/5 16:25
+     * @date: 24/11/7 14:56
      */
     @ApiOperation(value = "项目表-分页列表查询", notes = "项目表-分页列表查询")
     @GetMapping(value = "/list4Audit")
@@ -165,6 +156,9 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //('市科技局已提交', '8');
         //('财政主管理部门待审核', '9');
         //('财政主管理部门审核通过', '10');
+        // 11 已立项
+        // 12 已验收
+        //13  已结项
 
         //申请人数据
         if ("shenbaoren_role".equals(loginUser.getRoleCode())) {
@@ -227,7 +221,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //13  已结项
 
         //财政管理员看到要立项的数据
-        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+        if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("budget_status", 10, 11);
         } else {
             queryWrapper.in("project_status", 11);
@@ -271,7 +265,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //13  已结项
 
         //财政管理可以看到要验收的数据
-        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+        if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("project_status", 11, 12);
         } else {
             queryWrapper.in("project_status", 12);
@@ -303,7 +297,7 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         //13  已结项
 
         //财政管理可以看到要验收的数据
-        if ("caizheng_admin".equals(loginUser.getRoleCode())) {
+        if ("kejiju_admin".equals(loginUser.getRoleCode())) {
             queryWrapper.in("project_status", 12, 13);
         } else {
             queryWrapper.in("project_status", 13);
@@ -312,10 +306,40 @@ public class ProjectController extends JeecgController<Project, IProjectService>
         return Result.OK(pageList);
     }
 
+    /**
+     * @description: 市科技局立项、验收、结项审核流程
+     * @param: [param, req]
+     * @return: org.jeecg.common.api.vo.Result<org.jeecg.modules.demo.project.entity.Project>
+     * @author: z.h.c
+     * @date: 24/11/7 14:44
+     */
     @ApiOperation(value = "项目表-更新状态", notes = "项目表-更新状态")
     @PostMapping(value = "/updateStatus")
     public Result<Project> updateStatus(@RequestBody Project param, HttpServletRequest req) {
+        Project project = projectService.getById(param.getId());
         projectService.updateById(param);
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        ProjectLog log = new ProjectLog();
+        log.setOperatorName(loginUser.getRealname());
+        log.setOperatorId(loginUser.getId());
+        log.setProjectId(project.getId());
+        log.setProjectName(project.getProjectName());
+        log.setOperationTime(new Date());
+        log.setProjectStatus(param.getProjectStatus());
+        log.setBudgetStatus(param.getBudgetStatus());
+        // 11 已立项
+        // 12 已验收
+        //13  已结项
+        if ("11".equals(param.getProjectStatus())) {
+            log.setOperationMark("市科技局立项");
+        }
+        if ("12".equals(param.getProjectStatus())) {
+            log.setOperationMark("市科技局验收");
+        }
+        if ("13".equals(param.getProjectStatus())) {
+            log.setOperationMark("市科技局结项");
+        }
+        iProjectLogService.save(log);
         return Result.OK("操作成功");
     }
 

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectLog/controller/ProjectLogController.java

@@ -53,6 +53,7 @@ public class ProjectLogController extends JeecgController<ProjectLog, IProjectLo
                                                    HttpServletRequest req) {
         QueryWrapper<ProjectLog> queryWrapper = QueryGenerator.initQueryWrapper(projectLog, req.getParameterMap());
         Page<ProjectLog> page = new Page<ProjectLog>(pageNo, pageSize);
+        queryWrapper.orderByDesc("operation_time");
         IPage<ProjectLog> pageList = projectLogService.page(page, queryWrapper);
         return Result.OK(pageList);
     }

jeecgboot-vue3/.env.development

@@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-VITE_PROXY = [["/jeecgboot","http://10.121.2.107:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://localhost:18086/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://10.121.2.107:18086/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://localhost:18086/jeecg-boot
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/jeecgboot

jeecgboot-vue3/src/views/projectApplication/jiexiang/jixiang4CaiZhengList.vue

@@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fieldMapToTime: [],
     },
     actionColumn: {
-      width: 320,
+      width: 350,
       fixed: 'right'
     },
     beforeFetch: (params) => {

jeecgboot-vue3/src/views/projectApplication/lixiang/lixiang4CaiZhengList.vue

@@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fieldMapToTime: [],
     },
     actionColumn: {
-      width: 320,
+      width: 350,
       fixed: 'right'
     },
     beforeFetch: (params) => {

jeecgboot-vue3/src/views/projectApplication/yanshao/yanshou4CaiZhengList.vue

@@ -64,7 +64,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({
       fieldMapToTime: [],
     },
     actionColumn: {
-      width: 320,
+      width: 350,
       fixed: 'right'
     },
     beforeFetch: (params) => {

jeecgboot-vue3/vite.config.ts

@@ -67,7 +67,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       https: false,
       port: VITE_PORT,
       // Load proxy configuration from .env
-      // proxy: createProxy(VITE_PROXY),
+      proxy: createProxy(VITE_PROXY),
     },
     build: {
       minify: 'esbuild',