注册企业修改

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

@@ -201,14 +201,14 @@ public class SysUserController {
 
     @PostMapping(value = "/add")
     public Result add(HttpServletRequest req,@RequestParam(name = "idCordFrontUrl") MultipartFile idCordFrontUrl,
-                      @RequestParam("idCordBackUrl") MultipartFile idCordBackUrl,
-                      @RequestParam("type") String type,
-                      @RequestParam("userName") String userName,
-                      @RequestParam("idCord") String idCord,
-                      @RequestParam("phone") String phone,
+                      @RequestParam(name ="idCordBackUrl") MultipartFile idCordBackUrl,
+                      @RequestParam(name ="type") String type,
+                      @RequestParam(name ="userName") String userName,
+                      @RequestParam(name = "idCord",required = false) String idCord,
+                      @RequestParam(value = "phone",required = false) String phone,
                       @RequestParam(name = "farmName",required = false) String farmName,
                       @RequestParam(name = "veterId",required = false) String veterId,
-                      @RequestParam(name = "address") String address,//身份证地址
+                      @RequestParam(name = "address",required = false) String address,//身份证地址
                       @RequestParam(name = "detailedAddress") String detailedAddress,//详细地址
                       @RequestParam(name = "detailedAdressCode") String detailedAdressCode//地址行政码
     ) throws UnsupportedEncodingException {

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

@@ -220,6 +220,37 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
 
         SysUser user = new SysUser();
+        if (Integer.parseInt(paramsMap.get("type")) == 2) {
+            user.setUserType(Integer.parseInt(paramsMap.get("type")));
+            user.setUserName(paramsMap.get("userName"));
+            user.setPhone(TokenSign.getPhone(httpServletRequest));
+            user.setAddress(paramsMap.get("address"));
+            user.setDetailedAdress(paramsMap.get("detailedAddress"));
+            user.setDetailedAdressCode(paramsMap.get("detailedAdressCode"));
+            user.setCreateTime(new Date());
+            user.setPermit(paramsMap.get("idCordFrontUrl"));
+            String s = paramsMap.get("detailedAdressCode");
+            String[] split = s.split(",");
+            user.setBriefAddressCode(split[split.length - 1]);
+            user.setAccoutType(1);
+            user.setIsRealName(1);
+            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("phone",TokenSign.getPhone(httpServletRequest));
+            Integer integer = userMapper.selectCount(queryWrapper);
+            QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("user_name", paramsMap.get("userName"));
+            Integer integer1 = userMapper.selectCount(queryWrapper1);
+            if (integer1 == 0) {
+                if (integer == 0) {
+                    userMapper.insert(user);
+                    return new Result(ResultCode.SUCCESS, user);
+                } else {
+                    return new Result(10001, "该手机号已被其他用户使用！", false);
+                }
+            }else{
+                return new Result(10001, "该企业已存在，请重新注册！", false);
+            }
+        }
         user.setUserType(Integer.parseInt(paramsMap.get("type")));
         user.setUserName(paramsMap.get("userName"));
         user.setIdCard(paramsMap.get("idCord"));
@@ -238,7 +269,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             System.out.println(paramsMap.get("veterId"));
             user.setVeterId((paramsMap.get("veterId")));
         }
-        if (Integer.parseInt(paramsMap.get("type")) == 3) {
+        user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
+        user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
+        if ( Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
             PovertyUserRegist povertyUserRegist = povertyUserRegistMapper.selectOne(queryWrapper);
@@ -250,11 +283,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 user.setFarmType(0);
             }
             user.setFarmName(paramsMap.get("farmName"));
-        }
-
-        user.setIdCardFrontUrl(paramsMap.get("idCordFrontUrl"));
-        user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
-        if (Integer.parseInt(paramsMap.get("type")) == 2 || Integer.parseInt(paramsMap.get("type")) == 3) {
             user.setAccoutType(1);
             user.setIsRealName(1);
             QueryWrapper<SysUser> queryWrapper1 = new QueryWrapper<>();

admin/src/main/java/com/huimv/farm/test/Print2.java

@@ -39,8 +39,7 @@ public class Print2 {
             subsidyVo.setId(i);
             subsidyVo.setName(reportVo.getVillageName());
             subsidyVo.setType1(reportVo.getJcdx());
-            subsidyVo.setType2(reportVo.getYtph());
-            subsidyVo.setType3(reportVo.getQt());
+            subsidyVo.setType2(reportVo.getYtph()+reportVo.getQt());
             subsidyVo.setCount(reportVo.getRnhs());
             subsidyVo.setNumber(reportVo.getRnts());
             subsidyVo.setMoney(reportVo.getRnje());
@@ -95,8 +94,7 @@ public class Print2 {
             subsidyVo.setId(i);
             subsidyVo.setName(reportVo.getVillageName());
             subsidyVo.setType1(reportVo.getJcdx());
-            subsidyVo.setType2(reportVo.getYtph());
-            subsidyVo.setType3(reportVo.getQt());
+            subsidyVo.setType2(reportVo.getYtph()+reportVo.getQt());
             subsidyVo.setCount(reportVo.getRnhs());
             subsidyVo.setNumber(reportVo.getRnts());
             subsidyVo.setMoney(reportVo.getRnje());