Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/zc/controller/ZcController.java

@@ -29,6 +29,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.zc.entity.Zc;
@@ -176,7 +177,10 @@
         user.setJurisdiction(zc.getJurisdiction());
         user.setExamination_type("0");
         user.setExamination_mx("正常");
         user.setCardid(zc.getCardid());
         iUserService.saveOrUpdate(user);


      }
      return R.status(zcService.saveOrUpdate(zc));
   }
@@ -203,6 +207,23 @@
      String times = df.format(new Date());
      zc.setZctime(times);
      zcService.inster(zc);

      String s = "insert into act_zc(id,username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid)" +
         "values(" + zc.getId() + "'" +
         "," + "'" + zc.getUsername() + "'" +
         "," + "'" + zc.getPassword() + "'" +
         "," + "'" + zc.getSname() + "'" +
         "," + "'" + zc.getSex() + "'" +
         "," + "'" + zc.getPhone() + "'" +
         "," + "'" + zc.getZctime() + "'" +
         "," + "'" + zc.getDeptid() + "'" +
         "," + "'" + zc.getParentId() + "'" +
         "," + "'" + zc.getJurisdiction() + "'" +
         "," + "'" + zc.getCardid() + "'" + ")";

      System.out.println(s);
      FtpUtil.sqlFileUpload(s);

      return R.success("新增成功");
   }