11-17-修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/SysRoleWorkController.java

@@ -124,6 +124,14 @@ public class SysRoleWorkController extends BaseController {
         return R.ok(sysRoleWorkService.isHaveValue(LoginHelper.getUserId()));
     }
 
+    /**
+     * 根据用户和项目判断是否有角色流程
+     */
+    @GetMapping("/getRoleWork/{projectId}")
+    public R<Boolean> getRoleWorkByProject(@PathVariable("projectId") Long projectId) {
+        return R.ok(sysRoleWorkService.isHaveValueByProject(projectId));
+    }
+
     /**
      * 获取角色对应流程     弃用
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/SysRoleWorkServiceImpl.java

@@ -244,25 +244,33 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
         List<SysUserRole> allRoleList = baseMapper.getAllRoleList(userId);
 
         //初始化
-        LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
+//        LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
 
         List<BusProjectVo> busProjectVoList = new ArrayList<>();
 
         //获取到该用户所有有流程的项目 说明在该项目下该用户有角色有所属流程
         for (SysUserRole sysUserRole : allRoleList) {
-            lqw.clear();
+//            lqw.clear();
-            lqw.eq(SysRoleWork::getProjectId,sysUserRole.getProjectId());
+//            lqw.eq(SysRoleWork::getProjectId,sysUserRole.getProjectId());
-            lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
+//            lqw.eq(SysRoleWork::getRoleId, sysUserRole.getRoleId());
-            SysRoleWork one = getOne(lqw);
+//            SysRoleWork one = getOne(lqw);
-            if (one != null){
+//            if (one != null){
-                //先拿到该项目
+//                //先拿到该项目
-                BusProjectQueryReq req = new BusProjectQueryReq();
+//                BusProjectQueryReq req = new BusProjectQueryReq();
-                req.setId(sysUserRole.getProjectId());
+//                req.setId(sysUserRole.getProjectId());
-                List<BusProjectVo> vos = projectService.queryList(req);
+//                List<BusProjectVo> vos = projectService.queryList(req);
-                if (vos != null && !vos.isEmpty()){
+//                if (vos != null && !vos.isEmpty()){
-                    if(!busProjectVoList.contains(vos.getFirst())){
+//                    if(!busProjectVoList.contains(vos.getFirst())){
-                        busProjectVoList.add(vos.getFirst());
+//                        busProjectVoList.add(vos.getFirst());
-                    }
+//                    }
+//                }
+//            }
+            BusProjectQueryReq req = new BusProjectQueryReq();
+            req.setId(sysUserRole.getProjectId());
+            List<BusProjectVo> vos = projectService.queryList(req);
+            if (vos != null && !vos.isEmpty()){
+                if(!busProjectVoList.contains(vos.getFirst())){
+                    busProjectVoList.add(vos.getFirst());
                 }
             }
         }
@@ -288,4 +296,25 @@ public class SysRoleWorkServiceImpl extends ServiceImpl<SysRoleWorkMapper, SysRo
         return busProjectVoList;
     }
 
+
+    /**
+     * 根据用户和项目判断是否有角色流程
+     */
+    public Boolean isHaveValueByProject(Long projectId){
+        Long userId = LoginHelper.getUserId();
+        List<SysUserRole> roleList = baseMapper.getRoleList(userId, projectId);
+        if (roleList != null && !roleList.isEmpty()){
+            for (SysUserRole userRole : roleList) {
+                LambdaQueryWrapper<SysRoleWork> lqw = new LambdaQueryWrapper<>();
+                lqw.eq(SysRoleWork::getRoleId, userRole.getRoleId());
+                lqw.eq(SysRoleWork::getProjectId,projectId);
+                List<SysRoleWork> list = list(lqw);
+                if (list != null && !list.isEmpty()){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java

@@ -253,4 +253,10 @@ public interface IBusProjectService extends IService<BusProject> {
     Map<String, Map<String, Object>> getInfoData(TanchuangInfoReq req);
 
     Boolean updatePosition(ProjectUpdateDto dto);
+
+    /**
+     * 生成项目周报模板
+     */
+    String testExcel();
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/fymx/domain/XzdBxBxsqFymx.java

@@ -40,6 +40,11 @@ public class XzdBxBxsqFymx extends BaseEntity {
      */
     private Long deptId;
 
+    /**
+     * 类型id
+     */
+    private Long lxId;
+
     /**
      * 费用类型(1农产品2旅客运输)
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/bx/bxsq/service/impl/XzdBxBxsqServiceImpl.java

@@ -19,7 +19,6 @@ import org.dromara.system.domain.vo.SysDeptVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.system.service.impl.SysDeptServiceImpl;
 import org.dromara.system.service.impl.SysUserServiceImpl;
-import org.dromara.xzd.bx.bxsq.bxlx.domain.vo.XzdBxBxsqBxlxVo;
 import org.dromara.xzd.bx.bxsq.bxlx.service.impl.XzdBxBxsqBxlxServiceImpl;
 import org.dromara.xzd.bx.bxsq.domain.XzdBxBxsq;
 import org.dromara.xzd.bx.bxsq.domain.bo.XzdBxBxsqBo;
@@ -399,12 +398,12 @@ public class XzdBxBxsqServiceImpl extends ServiceImpl<XzdBxBxsqMapper, XzdBxBxsq
                 }
             }
             //报销类型
-            if (vo.getBxlx() != null) {
+//            if (vo.getBxlx() != null) {
-                XzdBxBxsqBxlxVo bxsqBxlxVo = xzdBxBxsqBxlxService.queryById(vo.getBxlx());
+//                XzdBxBxsqBxlxVo bxsqBxlxVo = xzdBxBxsqBxlxService.queryById(vo.getBxlx());
-                if (bxsqBxlxVo != null) {
+//                if (bxsqBxlxVo != null) {
-                    vo.setBxlxmc(bxsqBxlxVo.getLxmc());
+//                    vo.setBxlxmc(bxsqBxlxVo.getLxmc());
-                }
+//                }
-            }
+//            }
         }
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/controller/XzdSupplierInfoController.java

@@ -16,9 +16,12 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.xzd.domain.bo.XzdProjectBo;
 import org.dromara.xzd.domain.bo.XzdSupplierInfoBo;
 import org.dromara.xzd.domain.vo.XzdCustomertypeVo;
+import org.dromara.xzd.domain.vo.XzdProjectVo;
 import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
+import org.dromara.xzd.service.IXzdProjectService;
 import org.dromara.xzd.service.IXzdSupplierInfoService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,6 +41,7 @@ import java.util.List;
 public class XzdSupplierInfoController extends BaseController {
 
     private final IXzdSupplierInfoService xzdSupplierInfoService;
+    private final IXzdProjectService xzdProjectService;
 
     /**
      * 查询供应商信息列表
@@ -114,4 +118,26 @@ public class XzdSupplierInfoController extends BaseController {
     public R<List<XzdCustomertypeVo>> typeList() {
         return xzdSupplierInfoService.typeList();
     }
+
+    /**
+     * 查询项目信息列表
+     */
+    @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR)
+    @GetMapping("/projectList")
+    public TableDataInfo<XzdProjectVo> list(XzdProjectBo bo, PageQuery pageQuery) {
+        return xzdProjectService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取项目信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission(value = {"xzd:supplierInfo:add", "xzd:supplierInfo:edit", "xzd:supplierInfo:list"}, mode = SaMode.OR)
+    @GetMapping("/project/{id}")
+    public R<XzdProjectVo> getProjectInfo(@NotNull(message = "主键不能为空")
+                                   @PathVariable Long id) {
+        return R.ok(xzdProjectService.queryById(id));
+    }
+
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdProject.java

@@ -156,7 +156,7 @@ public class XzdProject extends BaseEntity {
     /**
      * 建设单位
      */
-    private String constructionUnit;
+    private Long constructionUnit;
 
     /**
      * 项目属性

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdProjectBo.java

@@ -172,7 +172,7 @@ public class XzdProjectBo extends BaseEntity {
      * 建设单位
      */
 //    @NotBlank(message = "建设单位不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String constructionUnit;
+    private Long constructionUnit;
 
     /**
      * 项目属性

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractDetailsServiceImpl.java

@@ -125,6 +125,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<XzdContractDetails> lqw = Wrappers.lambdaQuery();
         lqw.orderByDesc(XzdContractDetails::getCreateTime);
+        lqw.eq(bo.getShzt() != null, XzdContractDetails::getShzt, bo.getShzt());
         lqw.eq(StringUtils.isNotBlank(bo.getHtzt()), XzdContractDetails::getHtzt, bo.getHtzt());
         lqw.eq(bo.getId() != null, XzdContractDetails::getId, bo.getId());
         lqw.eq(StringUtils.isNotBlank(bo.getContractType()), XzdContractDetails::getContractType, bo.getContractType());
@@ -486,6 +487,7 @@ public class XzdContractDetailsServiceImpl extends ServiceImpl<XzdContractDetail
                 for (XzdYhxx xzdYhxx : xzdYhxxList) {
                     XzdSupplierOpenBank byId = xzdSupplierOpenBankService.getById(xzdYhxx.getYhId());
                     if (byId != null){
+                        byId.setAccount(xzdYhxx.getAccount());
                         xzdSupplierOpenBanks.add(byId);
                     }
                 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdProjectServiceImpl.java

@@ -151,7 +151,7 @@ public class XzdProjectServiceImpl extends ServiceImpl<XzdProjectMapper, XzdProj
         lqw.eq(StringUtils.isNotBlank(bo.getContractingMethod()), XzdProject::getContractingMethod, bo.getContractingMethod());
 //        lqw.eq(StringUtils.isNotBlank(bo.getInvolvedFinancialOrganization()), XzdProject::getInvolvedFinancialOrganization, bo.getInvolvedFinancialOrganization());
         lqw.eq(StringUtils.isNotBlank(bo.getBusinessModel()), XzdProject::getBusinessModel, bo.getBusinessModel());
-        lqw.eq(StringUtils.isNotBlank(bo.getConstructionUnit()), XzdProject::getConstructionUnit, bo.getConstructionUnit());
+        lqw.eq(bo.getConstructionUnit() != null, XzdProject::getConstructionUnit, bo.getConstructionUnit());
         lqw.eq(StringUtils.isNotBlank(bo.getProjectAttribute()), XzdProject::getProjectAttribute, bo.getProjectAttribute());
         lqw.eq(StringUtils.isNotBlank(bo.getGroupProject()), XzdProject::getGroupProject, bo.getGroupProject());
         lqw.eq(StringUtils.isNotBlank(bo.getDescription()), XzdProject::getDescription, bo.getDescription());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdProjectMapper.xml

@@ -102,6 +102,10 @@
             AND project.id != #{selfId}
         </if>
 
+        <if test='constructionUnit != null and constructionUnit != ""'>
+            AND project.construction_unit = #{constructionUnit}
+        </if>
+
         </where>
 
         ORDER BY project.create_time DESC