bugfix

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsTemplateRecord.java

@@ -73,10 +73,13 @@ public class BmsTemplateRecord extends BaseInfoEntity {
     private String notes;
 
     /**
-     * 状态  0=未开始 1=过期 2=有效
+     * 状态  0=未开始 1=过期 2=有效 3长期有效
      */
-    @Excel(name = "状态  0=未开始 1=过期 2=有效" , readConverterExp = "0=未开始,1=过期,2=有效")
+    @Excel(name = "状态  0=未开始 1=过期 2=有效 3长期有效" , readConverterExp = "0=未开始,1=过期,2=有效,3=长期有效")
-    @ApiModelProperty("状态  0=未开始 1=过期 2=有效")
+    @ApiModelProperty("状态  0=未开始 1=过期 2=有效 3长期有效")
     private Integer status;
 
+    @Excel(name = "是否限时" , readConverterExp = "0=限时,1=不限时")
+    @ApiModelProperty(value = "是否限时,0:限时，1:不限时")
+    private Integer isTime;
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsTemplateRecordServiceImpl.java

@@ -120,8 +120,15 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
         if(!isFlag.isEmpty()){
             throw new ServiceException("该申报任务标题已经存在");
         }
-        //新增的时候根据当前时间判断状态是否有效
+        //如果不限时
-        tiTimeChange.getTime(bmsTemplateRecordAddDto);
+        if(bmsTemplateRecordAddDto.getIsTime()==null){
+            throw new ServiceException("请选择是否限时");
+        } else if(bmsTemplateRecordAddDto.getIsTime() == 1){
+            bmsTemplateRecordAddDto.setStatus(3);
+        }else {
+            //新增的时候根据当前时间判断状态是否有效
+            tiTimeChange.getTime(bmsTemplateRecordAddDto);
+        }
         //添加在线模板
         num = baseMapper.insert(bmsTemplateRecordAddDto);
         //前端excel企业名录集合
@@ -267,13 +274,22 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int supplementation(BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) {
-        //只有未修改之前是过期的才能补录
+        BmsTemplateRecord infos = getById(bmsTemplateRecordUpdateDto.getId());
-        if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
+        if (infos.getIsTime() == 1){
-            throw new ServiceException("未过期不可以补录");
+            bmsTemplateRecordUpdateDto.setStartTime(null);
-        }
+            bmsTemplateRecordUpdateDto.setEndTime(null);
-        tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
+            bmsTemplateRecordUpdateDto.setStatus(3);
-        if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
+        }else if(infos.getIsTime() == 0){
-            throw new ServiceException("请修改时间范围为有效区间");
+            //只有未修改之前是过期的才能补录
+            if (bmsTemplateRecordUpdateDto.getStatus() != 1) {
+                throw new ServiceException("未过期不可以补录");
+            }
+            tiTimeChange.getTime(bmsTemplateRecordUpdateDto);
+            if (bmsTemplateRecordUpdateDto.getStatus() != 2) {
+                throw new ServiceException("请修改时间范围为有效区间");
+            }
+        }else {
+            throw new ServiceException("补录失败");
         }
         int num = baseMapper.updateById(bmsTemplateRecordUpdateDto);
         //要添加的在线申报记录
@@ -304,65 +320,11 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl<BmsTemplateRecordM
             getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
         });
 
-        //去在线申报记录找已经填报过的企业
-//        QueryWrapper<BmsDeclarationRecords> query = new QueryWrapper<>();
-//        query.eq("template_record_id", bmsTemplateRecordUpdateDto.getId())
-//                .ne("status", 0)
-//                .isNotNull("detail_id");
-//        List<BmsDeclarationRecords> deRList = iBmsDeclarationRecordsService.list(query);
-        //存储已经填报过的所有企业信用代码
-//        List<BmsEnterpriseDirectory> deIdList = new ArrayList<>();
-//        for (BmsDeclarationRecords items : deRList) {
-//            BmsEnterpriseDirectory bmsEnterpriseDirectory = new BmsEnterpriseDirectory();
-//            bmsEnterpriseDirectory.setCreditCode(items.getCreditCode());
-//            deIdList.add(bmsEnterpriseDirectory);
-//        }
-
-
-
-        // 创建存放所有数据的map
-//        Map<String, BmsEnterpriseDirectory> map = new HashMap<>();
-//        // 合并俩个集合
-//        list.addAll(enterpriseDirectoryList);
-//        // 遍历合并后的集合存放到map里
-//        list.forEach(t -> {
-//            map.putIfAbsent(t.getCreditCode(), t);
-//        });
-//        // 这是将excel和企业名录去重之后的企业
-//        List<BmsEnterpriseDirectory> mergeList = new ArrayList<>(map.values());
-//
-//        List<String> code = new ArrayList<>();
-//        mergeList.forEach(x->{
-//            code.add(x.getCreditCode());
-//            x.setTemplateRecordId(bmsTemplateRecordUpdateDto.getId());
-//            getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getTemplateId());
-//        });
-
-//        QueryWrapper<BmsDeclarationRecords> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.in("credit_code", code);
-//        queryWrapper.eq("template_record_id", bmsTemplateRecordUpdateDto.getId());
-//        queryWrapper.eq("status", 0);
-//        queryWrapper.isNull("detail_id");
-//        iBmsDeclarationRecordsService.remove(queryWrapper);
         //新增到企业名录
         enterpriseDirectoryService.saveBatch(enterpriseDirectoryList);
         //最后新添加进在线申报记录
         iBmsDeclarationRecordsService.saveBatch(drlist);
 
-//        //再去在线申报记录里面查找相关企业的在线申报记录
-//        List<BmsDeclarationRecords> bm = iBmsDeclarationRecordsService.selectET(bmsTemplateRecordUpdateDto.getId(), idList);
-//        //保存要删除的在线申报记录id集合
-//        List<Long> deIdList = new ArrayList<>();
-//        //去查看这些申报记录里面未填报的企业
-//        bm.forEach(x->{
-//            if(x.getStatus() == 0){
-//                getDeclarationRecordsList(bmsTemplateRecordUpdateDto, drlist, x.getCreditCode(), bmsTemplateRecordUpdateDto.getId());
-//                deIdList.add(x.getId());
-//            }
-//        });
-//        //删除这些分配的在线申报记录
-//        iBmsDeclarationRecordsService.removeBatchByIds(deIdList);
-
         return num;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java

@@ -127,11 +127,17 @@ public class CommonServiceImpl implements ICommonService {
     public void checkDeclaration(String creditCode, int templateRecordId) {
         // check当前企业是否已经申请
         BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode));
-        // check 申请是否过期
+        // check 申请是否过期或者该申请是不限时的
-        BmsTemplateRecord templateRecord = iBmsTemplateRecordService.lambdaQuery().eq(BmsTemplateRecord::getId, templateRecordId).le(BmsTemplateRecord::getStartTime, LocalDate.now()).ge(BmsTemplateRecord::getEndTime, LocalDate.now()).one();
+        BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(templateRecordId);
-        if (BeanUtil.isEmpty(templateRecord)) {
+        if (templateRecord.getStatus() == 0) {
-            throw new ServiceException("该申请已经错过时间");
+            throw new ServiceException("该申请还未到填报时间");
+        }else if(templateRecord.getStatus() == 1){
+            throw new ServiceException("该申请已经过期");
         }
+//        BmsTemplateRecord templateRecord = iBmsTemplateRecordService.lambdaQuery().eq(BmsTemplateRecord::getId, templateRecordId).le(BmsTemplateRecord::getStartTime, LocalDate.now()).ge(BmsTemplateRecord::getEndTime, LocalDate.now()).one();
+//        if (BeanUtil.isEmpty(templateRecord)) {
+//            throw new ServiceException("该申请已经错过时间");
+//        }
         //查看该企业是否已经填报过
 //        BmsTemplateRecord templateRecordOne = iBmsTemplateRecordService.getById(templateRecordId);
 //        List<BmsDeclarationRecords> list = iBmsDeclarationRecordsService.lambdaQuery().eq(BmsDeclarationRecords::getEnterpriseId, enterpriseInfo.getId()).eq(BmsDeclarationRecords::getTemplateId, templateRecordOne.getTemplateId()).list();

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/controller/ChiefController.java

@@ -92,7 +92,7 @@ public class ChiefController {
                     ChiefResponse bean = JSONUtil.toBean(dataJson, ChiefResponse.class);
                     //判断几个政务端用户,等待商量结果
                     //lj 102 其他是100 //要给dept部门id
-                    bean.setToken(singleLoginService.singleLogin(bean.getId(),bean.getName(),null,"02",bean.getMobile()));
+                    bean.setToken(singleLoginService.singleLogin(bean.getAccountName(),bean.getName(),null,"02",bean.getMobile()));
                     return AjaxResult.success(bean);
                 } else {
                     throw new ServiceException("登陆失败");

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/single/service/impl/SingleLoginServiceImpl.java

@@ -55,6 +55,7 @@ public class SingleLoginServiceImpl implements SingleLoginService {
                 //在这里可以判断具体要给什么权限  要给dept部门id
                 roles[0]=102L;
                 user.setDeptId(100L);
+                user.setZwuser(userName);
             }
             user.setRoleIds(roles);
             user.setStatus("0");

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JProjectMapper.java

@@ -39,5 +39,7 @@ public interface JProjectMapper extends BaseMapper<JProject> {
 
 
     List<JProject> selectAll(@Param("name") String name);
+
+    List<JProject> selectAl1l();
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java

@@ -57,5 +57,6 @@ public interface JProjectService extends IService<JProject> {
     List<JProject> selectAll(String jProject);
 
 
+    List<JProject> selectAl1l();
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.jjh.ent.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,8 +8,8 @@ import com.ruoyi.jjh.declaration.entity.BmsFundingDetail;
 import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo;
 import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService;
 import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService;
-import com.ruoyi.jjh.ent.mapper.JProjectMapper;
 import com.ruoyi.jjh.ent.entity.JProject;
+import com.ruoyi.jjh.ent.mapper.JProjectMapper;
 import com.ruoyi.jjh.ent.service.JProjectService;
 import org.springframework.stereotype.Service;
 
@@ -114,6 +115,18 @@ public class JProjectServiceImpl extends ServiceImpl<JProjectMapper, JProject> i
         return baseMapper.selectAll(jProject);
     }
 
+    @Override
+    public List<JProject> selectAl1l() {
+        List<JProject> lists = baseMapper.selectAl1l();
+        for (JProject items : lists) {
+            JSONObject mergedObj = JSONObject.parseObject(items.getOtherJson());
+            if(mergedObj.get("统一社会信用代码")!=null){
+                items.setProjectName(String.valueOf(mergedObj.get("统一社会信用代码")));
+            }
+        }
+        return lists;
+    }
+
 
 }
 

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 9040
+  port: 9041
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-admin/src/main/resources/mapper/jjh/ent/JProjectMapper.xml

@@ -57,4 +57,10 @@
         </where>
         order by create_time desc ,project_year desc
     </select>
+    <select id="selectAl1l" resultType="com.ruoyi.jjh.ent.entity.JProject">
+        SELECT b.declare_unit,b.other_json
+        FROM j_project b
+        WHERE b.declare_unit COLLATE utf8mb4_general_ci NOT IN
+              (SELECT a.enterprise_name COLLATE utf8mb4_general_ci FROM bms_enterprise_basic_info a);
+    </select>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -47,6 +47,20 @@ public class SysUser extends BaseEntity {
     @Excel(name = "用户类型")
     private String userType;
 
+    /**
+     * 政务端账号
+     */
+    @Excel(name = "政务端账号")
+    private String zwuser;
+
+    public String getZwuser() {
+        return zwuser;
+    }
+
+    public void setZwuser(String zwuser) {
+        this.zwuser = zwuser;
+    }
+
     public String getUserType() {
         return userType;
     }

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -116,7 +116,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
 //                .antMatchers("/common/**").permitAll()
-//                .antMatchers("/system/**").permitAll()
+                .antMatchers("/system/chief").permitAll()
 
 
                 // 除上面外的所有请求全部需要鉴权认证

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -10,6 +10,7 @@
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
+        <result property="zwuser" column="zwuser"/>
 
         <result property="userType" column="user_type"/>
         <result property="enterpriseId" column="enterprise_id"/>
@@ -53,6 +54,7 @@
     <sql id="selectUserVo">
         select u.user_id,
                u.dept_id,
+               u.zwuser,
                u.user_name,
                u.nick_name,
                u.email,
@@ -89,7 +91,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id,u.enterprise_id,u.user_type, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
+        select u.user_id, u.dept_id,u.zwuser,u.enterprise_id,u.user_type, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user
         u
         left join sys_dept d on u.dept_id = d.dept_id
@@ -122,7 +124,7 @@
 
     <select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
             resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id,u.enterprise_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,u.zwuser, u.dept_id,u.enterprise_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -140,7 +142,7 @@
 
     <select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
             resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id,u.enterprise_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+        select distinct u.user_id,u.zwuser, u.dept_id,u.enterprise_id,u.user_type, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -195,6 +197,7 @@
     <insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true"
             keyProperty="userId">
         insert into sys_user(
+        <if test="zwuser != null and zwuser != ''">zwuser,</if>
         <if test="userId != null and userId != 0">user_id,</if>
         <if test="deptId != null and deptId != 0">dept_id,</if>
         <if test="userName != null and userName != ''">user_name,</if>
@@ -211,6 +214,7 @@
         <if test="remark != null and remark != ''">remark,</if>
         create_time
         )values(
+        <if test="zwuser != null and zwuser != ''">#{zwuser},</if>
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="userName != null and userName != ''">#{userName},</if>
@@ -232,6 +236,7 @@
     <update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
         update sys_user
         <set>
+            <if test="zwuser != null and zwuser != ''">zwuser = #{zwuser},</if>
             <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
             <if test="userName != null and userName != ''">user_name = #{userName},</if>
             <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>