Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 9ded1cc24d75fe3acd058aa1918624ff81bfcd50

 src/main/java/org/springblade/modules/permit/controller/PermitController.java

@@ -146,19 +146,19 @@
      permit.setStorage("1");
      permit.setPermitime(new Date());
      permitService.save(permit);
      String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
      String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
      String s = "insert into sys_permit(id,enterpriseName,representative," +
         "address,business,region,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
         "values(" + "'" + permit.getId() + "'" + ","+ "'" + permit.getEnterprisename() + "'" + "," + "'"
         + permit.getRepresentative() + "'" + "," + "'" +
         permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
         permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
         + permit.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + permit.getPtype() + "'" + "," +
         "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
         + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
         "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
      FtpUtil.sqlFileUpload(s);
//      String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
//      String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
//      String s = "insert into sys_permit(id,enterpriseName,representative," +
//         "address,business,region,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
//         "values(" + "'" + permit.getId() + "'" + ","+ "'" + permit.getEnterprisename() + "'" + "," + "'"
//         + permit.getRepresentative() + "'" + "," + "'" +
//         permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
//         permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
//         + permit.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + permit.getPtype() + "'" + "," +
//         "'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
//         + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
//         "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
//      FtpUtil.sqlFileUpload(s);
      return R.success("新增成功");
   }