后台新增

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillBuyInfoController.java

@@ -121,6 +121,34 @@ public class BillBuyInfoController {
         return billBuyInfoService.listDetail(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listPcTransaction")
+    public Result listPcTransaction(HttpServletRequest httpServletRequest,@RequestBody Map<String,String> paramsMap){
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String search = paramsMap.get("search");
+        Long id = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        if (id != 1){
+            return new Result(10001,"该账号无权限!",false);
+        }
+        Page<BillBuyInfoVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<BillBuyInfoVo> billBuyInfoPage = billBuyInfoMapper.listPcTransaction(page,search);
+        Page<BillBuyInfoImageVo> billBuyInfoVoPage = new Page<>();
+        List billBuyInfoImageVoList = new ArrayList();
+        for (BillBuyInfo record : billBuyInfoPage.getRecords()) {
+            BillBuyInfoImageVo billBuyInfoImageVo = new BillBuyInfoImageVo();
+            BeanUtil.copyProperties(record,billBuyInfoImageVo);
+            if (ObjectUtil.isNotEmpty(record.getBuyPayGoodsPicUrl())){
+                billBuyInfoImageVo.setPages(record.getBuyPayGoodsPicUrl().split(","));
+            }
+            billBuyInfoImageVoList.add(billBuyInfoImageVo);
+        }
+        billBuyInfoVoPage.setRecords(billBuyInfoImageVoList);
+        billBuyInfoVoPage.setTotal(billBuyInfoPage.getTotal());
+        billBuyInfoVoPage.setCountId(billBuyInfoPage.getCountId());
+        billBuyInfoVoPage.setCurrent(billBuyInfoPage.getCurrent());
+        return new Result(ResultCode.SUCCESS, billBuyInfoVoPage);
+    }
+
 
 
 }

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillIsolatedController.java

@@ -80,4 +80,9 @@ public class BillIsolatedController {
         }
         return new Result(ResultCode.SUCCESS, billIsolatedVo);
     }
+
+    @PostMapping("/listPcIsolation")
+    public Result listPcIsolation(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return iBillIsolatedService.listPcIsolation(httpServletRequest,paramsMap);
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.java

@@ -21,4 +21,6 @@ public interface BillBuyInfoMapper extends BaseMapper<BillBuyInfo> {
     BillBuyInfoVo getLast(@Param("userName") Long userName);
 
     Page<BillBuyInfoVo> listTransaction(Page<BillBuyInfoVo> page,@Param("search") String search,@Param("addressCode") String addressCode);
+
+    Page<BillBuyInfoVo> listPcTransaction(Page<BillBuyInfoVo> page, String search);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBillIsolatedService.java

@@ -28,4 +28,5 @@ public interface IBillIsolatedService extends IService<BillIsolated> {
 
     Result cancelIsolation(HttpServletRequest httpServletRequest,MultipartFile isolatedImage1,MultipartFile isolatedImage2,MultipartFile isolatedImage3 ,MultipartFile observeSecureImage, String id, String idDead, String deaths) throws IOException;
 
+    Result listPcIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -20,11 +20,11 @@ import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -222,4 +222,22 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         return Result.SUCCESS();
     }
 
+    @Override
+    public Result listPcIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        String inspectionName = paramsMap.get("inspectionName");
+        String type = paramsMap.get("type");
+        if(TokenSign.getMemberIdByJwtToken(httpServletRequest)!= 1){
+            return new Result(10001,"该账号无权限!",false);
+        }
+        Page<BillIsolated> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        if (type.equals("1")){
+            return new Result(ResultCode.SUCCESS,this.page(page,new QueryWrapper<BillIsolated>().orderByDesc("create_time").like(StringUtils.isNotEmpty(inspectionName),"inspection_name",inspectionName).ge("str_isolated",LocalDate.now()).le("end_isolated",LocalDate.now())));
+        }else {
+            return new Result(ResultCode.SUCCESS,this.page(page,new QueryWrapper<BillIsolated>().orderByDesc("create_time").like(StringUtils.isNotEmpty(inspectionName),"inspection_name",inspectionName).lt("end_isolated",LocalDate.now())));
+        }
+
+    }
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillSubsidyServiceImpl.java

@@ -324,8 +324,9 @@ public class BillSubsidyServiceImpl extends ServiceImpl<BillSubsidyMapper, BillS
         billSubsidy.setCreateUser(id);
         Integer count = billBuyInfoMapper.selectCount(new QueryWrapper<BillBuyInfo>().eq("inspection_num", billSubsidy.getInspectionNum()));
 
+        String[] split = billSubsidy.getInspectionNum().split(",");
         BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>()
-                .eq("inspection_num", billSubsidy.getInspectionNum())
+                .eq("inspection_num", split[0])
 //                .ne("inspection_type",0)
                 .eq("inspection_sch", 4));
         Integer userType = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", billLandingInspection.getCreateUser())).getUserType();

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -36,4 +36,10 @@
         ON b.inspection_num = l.inspection_num  LEFT JOIN `sys_user` u ON b.buyer_id = u.id
         WHERE u.brief_address_code LIKE  '${addressCode}%' AND b.buyer_name LIKE '%${search}%' AND b.bill_buy_status = 2  AND  l.inspection_sch = 4 ORDER BY b.create_time DESC
     </select>
+
+    <select id="listPcTransaction" resultType="com.huimv.farm.damsubsidy.entity.vo.BillBuyInfoVo">
+        SELECT b.*,l.cargo_owner,l.owner_phone,l.animal_type,l.animal_number_up,l.use_to,l.start_tran,l.reach_tran,eartags FROM `bill_buy_info` b LEFT JOIN `bill_landing_inspection` l
+        ON b.inspection_num = l.inspection_num  LEFT JOIN `sys_user` u ON b.buyer_id = u.id
+        WHERE b.buy_name LIKE '%${search}%' AND b.bill_buy_status = 2  AND  l.inspection_sch = 4 ORDER BY b.create_time DESC
+    </select>
 </mapper>