Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 9ded1cc24d75fe3acd058aa1918624ff81bfcd50

 src/main/java/org/springblade/modules/recordk/controller/RecordkController.java

@@ -27,6 +27,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.recordk.entity.Recordk;
import org.springblade.modules.recordk.service.IRecordkService;
@@ -34,6 +35,7 @@
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;

@@ -69,6 +71,7 @@
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入recordk")
   public R<IPage<Recordk>> list(Recordk recordk, Query query) {
      recordk.setStorage("1");
      IPage<Recordk> pages = recordkService.page(Condition.getPage(query), Condition.getQueryWrapper(recordk));
      return R.data(pages);
   }
@@ -92,7 +95,8 @@
   @ApiOperation(value = "新增", notes = "传入recordk")
   public R save(@Valid @RequestBody Recordk recordk) {
      String cardid = recordk.getCardid();
      Map map = recordkService.selectIn(cardid);
      String ptype = recordk.getPtype();
      Map map = recordkService.selectIn(cardid,ptype);
      if (map!=null){
         String id = map.get("id").toString();
         recordkService.removeByIds(Func.toLongList(id));
@@ -100,7 +104,22 @@
      recordk.setStorage("1");
      recordk.setType("2");
      recordk.setPermitime(new Date());
      return R.status(recordkService.save(recordk));
      recordkService.save(recordk);
//      String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getOfficetime());
//      String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recordk.getPermitime());
//      String s = "insert into sys_recordk(id,creditCode,enterpriseName,representative," +
//         "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
//         "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,cardid,overtime)" +
//         "values(" + "'" + recordk.getId() + "'" + "," + "'" + recordk.getCreditcode() + "'" + "," + "'" + recordk.getEnterprisename() + "'" + "," + "'"
//         + recordk.getRepresentative() + "'" + "," +"'" + recordk.getRegisteredcapital() + "'" + "," + "'"
//         + recordk.getOrganizationcode() + "'" + "," + "'" + recordk.getRegistrationnumber() + "'" + "," +
//         "'" + recordk.getIdentificationnumber() + "'" + "," + "'" + recordk.getEnterprises() + "'" + "," + "'" +
//         recordk.getAddress() + "'" + "," + "'" + recordk.getBusiness() + "'" + "," + "'" +
//         recordk.getRegion() + "'" + "," + "'" + recordk.getRegistration() + "'" + "," + "'" + recordk.getIndustry() + "'" + "," + "'" + recordk.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + recordk.getDeptid() + "'" + "," + "'" + recordk.getPtype() + "'" + "," +
//         "'" + recordk.getRepresentativecell() + "'" + "," + "'" + recordk.getContacts() + "'" + "," + "'" + recordk.getContactscell() + "'" + "," +
//         "'" + recordk.getPerid() + "'" + "," + "'" + recordk.getOffices() + "'" + "," + "'" + offtime + "'"+ "," + "'" + recordk.getCardid() + "'"+"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(recordk.getOvertime()) + "'"+")";
//      FtpUtil.sqlFileUpload(s);
      return R.success("成功");
   }

   /**
@@ -110,7 +129,8 @@
   @ApiOperation(value = "新增", notes = "传入permit")
   public R recorkstorage(@Valid @RequestBody Recordk recordk) {
      String cardid = recordk.getCardid();
      Map map = recordkService.selectIn(cardid);
      String ptype = recordk.getPtype();
      Map map = recordkService.selectIn(cardid,ptype);
      if (map!=null){
         recordk.setStorage("0");
         recordkService.updateById(recordk);
@@ -130,6 +150,15 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入recordk")
   public R update(@Valid @RequestBody Recordk recordk) {
//      String s1 = "update sys_recordk set type = " + "'" + recordk.getType() + "'" +
//         ",papprove = " + "'" + recordk.getPapprove() + "'"+
//         ",xapprove = " + "'" + recordk.getXapprove() + "'"+
//         ",sapprove = " + "'" + recordk.getSapprove() + "'"+
//         ",popinion = " + "'" + recordk.getPopinion() + "'"+
//         ",sopinion = " + "'" + recordk.getSopinion() + "'"+
//         ",xopinion = " + "'" + recordk.getXopinion() + "'"+
//         " " +"where id = " + "'" + recordk.getId() + "'";
//      FtpUtil.sqlFileUpload(s1);
      return R.status(recordkService.updateById(recordk));
   }

@@ -156,8 +185,8 @@


   @PostMapping("/selectIn")
   public R selectIn(String cardid) {
      Map map = recordkService.selectIn(cardid);
   public R selectIn(String cardid,String type) {
      Map map = recordkService.selectIn(cardid,type);
      return R.data(map);
   }