修改环保接收数据

app-admin/src/main/java/com/ruoyi/web/v2/v1/controller/ProtSjController.java

@@ -51,6 +51,9 @@ public class ProtSjController {
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate");
         QueryWrapper<ProtSj> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotEmpty(endDate)){
+            endDate  += " 23:59:59";
+        }
 
         queryWrapper.le(StringUtils.isNotEmpty(endDate), "create_time", endDate);
         queryWrapper.ge(StringUtils.isNotEmpty(startDate), "create_time", startDate);

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsStoreServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.v2.v1.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -41,7 +42,7 @@ public class JsStoreServiceImpl extends ServiceImpl<JsStoreMapper, JsStore> impl
 
     @Override
     public AjaxResult add(JsStore jsStore) {
-        JsStore jsStore1 = jsStoreMapper.selectOne(new QueryWrapper<JsStore>().orderByDesc("id").last(" limit 1"));
+        JsStore jsStore1 = jsStoreMapper.selectOne(new QueryWrapper<JsStore>().orderByDesc("id").last(" limit 1").between("store_time", DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date())));
         if (ObjectUtil.isNotEmpty(jsStore1)) {
             String materialBatch = jsStore1.getHarmlessTreatmentId();
             Integer integer = Integer.valueOf(materialBatch);

app-admin/src/main/java/com/ruoyi/web/v2/v1/service/impl/JsTransportServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.v2.v1.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -42,7 +43,7 @@ public class JsTransportServiceImpl extends ServiceImpl<JsTransportMapper, JsTra
                 return error("手机号码格式不正确！");
             }
         }
-        JsTransport jsTransport = transportMapper.selectOne(new QueryWrapper<JsTransport>().orderByDesc("id").last(" limit 1"));
+        JsTransport jsTransport = transportMapper.selectOne(new QueryWrapper<JsTransport>().orderByDesc("id").last(" limit 1").between("transport_time", DateUtil.beginOfDay(new Date()),DateUtil.endOfDay(new Date())));
         if (ObjectUtil.isNotEmpty(jsTransport)) {
             String materialBatch = jsTransport.getHarmlessTreatmentId();
             Integer integer = Integer.valueOf(materialBatch);

app-common/src/main/java/com/ruoyi/common/annotation/DataScope.java

@@ -19,7 +19,7 @@ public @interface DataScope
     /**
      * 部门表的别名
      */
-    public String deptAlias() default "";
+//    public String deptAlias() default "";
 
     /**
      * 用户表的别名

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

@@ -59,7 +59,7 @@ public class SysRole extends BaseEntity
     private Long[] menuIds;
 
     /** 部门组（数据权限） */
-    private Long[] deptIds;
+//    private Long[] deptIds;
 
     /** 角色菜单权限 */
     private Set<String> permissions;
@@ -196,15 +196,15 @@ public class SysRole extends BaseEntity
         this.menuIds = menuIds;
     }
 
-    public Long[] getDeptIds()
-    {
-        return deptIds;
-    }
-
-    public void setDeptIds(Long[] deptIds)
-    {
-        this.deptIds = deptIds;
-    }
+//    public Long[] getDeptIds()
+//    {
+//        return deptIds;
+//    }
+//
+//    public void setDeptIds(Long[] deptIds)
+//    {
+//        this.deptIds = deptIds;
+//    }
 
     public Set<String> getPermissions()
     {

app-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -74,7 +74,8 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
+//                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
+                dataScopeFilter(joinPoint, currentUser, null, controllerDataScope.userAlias(), permission);
             }
         }
     }
@@ -122,11 +123,13 @@ public class DataScopeAspect
                 if (scopeCustomIds.size() > 1)
                 {
                     // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+//                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+                    sqlString.append(StringUtils.format(" OR   role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
                 }
                 else
                 {
-                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+//                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+                    sqlString.append(StringUtils.format(" OR role_id = {} ) ", deptAlias, role.getRoleId()));
                 }
             }
             else if (DATA_SCOPE_SELF.equals(dataScope))
@@ -138,7 +141,7 @@ public class DataScopeAspect
                 else
                 {
                     // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+//                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
                 }
             }
             conditions.add(dataScope);
@@ -147,7 +150,7 @@ public class DataScopeAspect
         // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
         if (StringUtils.isEmpty(conditions))
         {
-            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
+//            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
         }
 
         if (StringUtils.isNotBlank(sqlString.toString()))

app-system/src/main/java/com/ruoyi/app/DTO/ProductTraceDTO.java

@@ -34,6 +34,15 @@ public class ProductTraceDTO {
     private BigDecimal unqualifiedWeight;
     private String dealWay;
     private String roadDealAmount;
+    private String oneCode;
+
+    public String getOneCode() {
+        return oneCode;
+    }
+
+    public void setOneCode(String oneCode) {
+        this.oneCode = oneCode;
+    }
 
     public String getRoadDealAmount() {
         return roadDealAmount;

app-system/src/main/java/com/ruoyi/app/DTO/SlaughterBatchDTO.java

@@ -26,6 +26,15 @@ public class SlaughterBatchDTO {
     private BigDecimal redWeight;
     private BigDecimal whiteWeight;
     private String purchaserId;
+    private String oneCode;
+
+    public String getOneCode() {
+        return oneCode;
+    }
+
+    public void setOneCode(String oneCode) {
+        this.oneCode = oneCode;
+    }
 
     public String getPurchaserId() {
         return purchaserId;

app-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -42,7 +42,7 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 部门信息集合
      */
     @Override
-    @DataScope(deptAlias = "d")
+//    @DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDept dept)
     {
         return deptMapper.selectDeptList(dept);

app-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -52,7 +52,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色数据集合信息
      */
     @Override
-    @DataScope(deptAlias = "d")
+//    @DataScope(deptAlias = "d")
     public List<SysRole> selectRoleList(SysRole role)
     {
         return roleMapper.selectRoleList(role);
@@ -320,13 +320,13 @@ public class SysRoleServiceImpl implements ISysRoleService
         int rows = 1;
         // 新增角色与部门（数据权限）管理
         List<SysRoleDept> list = new ArrayList<SysRoleDept>();
-        for (Long deptId : role.getDeptIds())
-        {
-            SysRoleDept rd = new SysRoleDept();
-            rd.setRoleId(role.getRoleId());
-            rd.setDeptId(deptId);
-            list.add(rd);
-        }
+//        for (Long deptId : role.getDeptIds())
+//        {
+//            SysRoleDept rd = new SysRoleDept();
+//            rd.setRoleId(role.getRoleId());
+//            rd.setDeptId(deptId);
+//            list.add(rd);
+//        }
         if (list.size() > 0)
         {
             rows = roleDeptMapper.batchRoleDept(list);

app-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -64,7 +64,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+//    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope( userAlias = "u")
     public List<SysUser> selectUserList(SysUser user)
     {
         return userMapper.selectUserList(user);
@@ -77,7 +78,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+//    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope( userAlias = "u")
     public List<SysUser> selectAllocatedList(SysUser user)
     {
         return userMapper.selectAllocatedList(user);
@@ -90,7 +92,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户信息集合信息
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
+//    @DataScope(deptAlias = "d", userAlias = "u")
+    @DataScope( userAlias = "u")
     public List<SysUser> selectUnallocatedList(SysUser user)
     {
         return userMapper.selectUnallocatedList(user);

app-system/src/main/resources/mapper/app/EntranceBatchMapper.xml

@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="roadDealAmount" column="road_deal_amount"/>
         <result property="unqualifiedWeight" column="unqualified_weight"/>
         <result property="dealWay" column="deal_way"/>
+        <result property="oneCode" column="one_code"/>
         <result property="totalSideWeight" column="total_side_weight"/>
         <result property="totalHeadWeight" column="total_head_weight"/>
         <result property="totalRedWeight" column="total_red_weight"/>

app-system/src/main/resources/mapper/app/PurchaserMapper.xml

@@ -177,6 +177,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getOneAnimal" resultMap="AnmicalDTOResult">
 SELECT DISTINCT b.animal_cert,b.meat_cert FROM `js_distribution` as a RIGHT JOIN
-js_produce_code AS b ON a.one_code=b.one_code where a.purchaser_id=#{purchaserName}
-    AND  b.animal_cert IS NOT NULL    </select>
+ -- 这个地方肯定有问题
+js_produce_code AS b ON a.one_code=b.one_code where a.purchaser_id=#{purchaserName}   order by b.id asc  limit 1
+ </select>
+
 </mapper>

app-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
 	        left join sys_user u on u.user_id = ur.user_id
-	        left join sys_dept d on u.dept_id = d.dept_id
+-- 	        left join sys_dept d on u.dept_id = d.dept_id
     </sql>
     
     <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">