lifei преди 6 години
родител
ревизия
2833768964

+ 35 - 2
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/controller/HlgCompanySubcontractorController.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.hlgcompany.controller;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -9,10 +10,17 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.hlgcompany.entity.HlgCompany;
 import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
+import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractorContract;
+import org.jeecg.modules.hlgcompany.service.IHlgCompanyService;
+import org.jeecg.modules.hlgcompany.service.IHlgCompanySubcontractorContractService;
 import org.jeecg.modules.hlgcompany.service.IHlgCompanySubcontractorService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -45,6 +53,7 @@ import com.alibaba.fastjson.JSON;
 public class HlgCompanySubcontractorController {
 	@Autowired
 	private IHlgCompanySubcontractorService hlgCompanySubcontractorService;
+
 	
 	/**
 	  * 分页列表查询
@@ -77,7 +86,7 @@ public class HlgCompanySubcontractorController {
 	public Result<HlgCompanySubcontractor> add(@RequestBody HlgCompanySubcontractor hlgCompanySubcontractor) {
 		Result<HlgCompanySubcontractor> result = new Result<HlgCompanySubcontractor>();
 		try {
-			hlgCompanySubcontractorService.save(hlgCompanySubcontractor);
+			hlgCompanySubcontractorService.saveHlgCompanySubcontractor(hlgCompanySubcontractor);
 			result.success("添加成功!");
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
@@ -123,6 +132,30 @@ public class HlgCompanySubcontractorController {
 		}
 		return Result.ok("删除成功!");
 	}
+
+	 /**
+	  * 启用/停用 服务商
+	  *
+	  * @param hlgCompanySubcontractor
+	  * @return
+	  */
+	 @PutMapping(value = "/isOnSubcontractor")
+	 public Result<?> isOnSubcontractor(@RequestBody HlgCompanySubcontractor hlgCompanySubcontractor) {
+		 String message = "";
+		 try {
+			 hlgCompanySubcontractorService.isOnSubcontractor(hlgCompanySubcontractor);
+			 if (hlgCompanySubcontractor.getIsLock() == 0) {
+				 message = "停用成功";
+			 } else {
+				 message = "启用成功";
+			 }
+		 } catch (Exception e) {
+			 log.error("操作失败", e.getMessage());
+			 return Result.error("操作失败!");
+		 }
+		 return Result.ok(message);
+	 }
+
 	
 	/**
 	  *  批量删除
@@ -163,7 +196,7 @@ public class HlgCompanySubcontractorController {
       * 导出excel
    *
    * @param request
-   * @param response
+   * @param
    */
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HlgCompanySubcontractor hlgCompanySubcontractor) {

+ 1 - 1
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/entity/HlgCompanySubcontractor.java

@@ -26,7 +26,7 @@ public class HlgCompanySubcontractor implements Serializable {
     
 	/**主键*/
 	@TableId(type = IdType.AUTO)
-	private java.lang.Integer id;
+	private Integer id;
 	/**所属企业*/
 	@Excel(name = "所属企业", width = 15)
 	private java.lang.Integer companyId;

+ 1 - 1
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/entity/HlgCompanySubcontractorContract.java

@@ -24,7 +24,7 @@ public class HlgCompanySubcontractorContract implements Serializable {
     private static final long serialVersionUID = 1L;
     
 	/**主键*/
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.AUTO)
 	private Integer id;
 	/**企业服务商*/
 	@Excel(name = "企业服务商", width = 15)

+ 2 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/HlgCompanySubcontractorMapper.java

@@ -19,4 +19,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface HlgCompanySubcontractorMapper extends BaseMapper<HlgCompanySubcontractor> {
 
     List<HlgCompanySubcontractor> findList(Page<HlgCompanySubcontractor> pageList, @Param("hlgCompanySubcontractor") HlgCompanySubcontractor hlgCompanySubcontractor, @Param(Constants.WRAPPER) QueryWrapper<HlgCompanySubcontractor> queryWrapper);
+
+    void saveHlgCompanySubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor);
 }

+ 1 - 1
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/mapper/xml/HlgCompanySubcontractorMapper.xml

@@ -44,7 +44,7 @@
     </select>
 
 
-    <insert id="insertHlgCompanySubcontractor"  keyProperty="id" useGeneratedKeys="true" parameterType="org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor">
+    <insert id="saveHlgCompanySubcontractor"  keyProperty="id" useGeneratedKeys="true" parameterType="org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor">
 		INSERT INTO hlg_company_subcontractor(
 			company_id,
 			subcontractor_id,

+ 4 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/IHlgCompanySubcontractorService.java

@@ -14,4 +14,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IHlgCompanySubcontractorService extends IService<HlgCompanySubcontractor> {
 
     Page<HlgCompanySubcontractor> pageList(Page<HlgCompanySubcontractor> page, HlgCompanySubcontractor hlgCompanySubcontractor, QueryWrapper<HlgCompanySubcontractor> queryWrapper);
+
+    void saveHlgCompanySubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor);
+
+    void isOnSubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor);
 }

+ 41 - 0
happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlgcompany/service/impl/HlgCompanySubcontractorServiceImpl.java

@@ -2,13 +2,23 @@ package org.jeecg.modules.hlgcompany.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.hlgcompany.entity.HlgCompany;
 import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractor;
+import org.jeecg.modules.hlgcompany.entity.HlgCompanySubcontractorContract;
 import org.jeecg.modules.hlgcompany.mapper.HlgCompanySubcontractorMapper;
+import org.jeecg.modules.hlgcompany.service.IHlgCompanyService;
+import org.jeecg.modules.hlgcompany.service.IHlgCompanySubcontractorContractService;
 import org.jeecg.modules.hlgcompany.service.IHlgCompanySubcontractorService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.transaction.Transactional;
+import java.util.Date;
+
 /**
  * @Description: 企业服务商表
  * @Author: jeecg-boot
@@ -17,8 +27,39 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class HlgCompanySubcontractorServiceImpl extends ServiceImpl<HlgCompanySubcontractorMapper, HlgCompanySubcontractor> implements IHlgCompanySubcontractorService {
+    @Autowired
+    private IHlgCompanyService hlgCompanyService;
+    @Autowired
+    private IHlgCompanySubcontractorContractService hlgCompanySubcontractorContractService;
+
     @Override
     public Page<HlgCompanySubcontractor> pageList(Page<HlgCompanySubcontractor> pageList, HlgCompanySubcontractor hlgCompanySubcontractor, QueryWrapper<HlgCompanySubcontractor> queryWrapper) {
         return pageList.setRecords(baseMapper.findList(pageList, hlgCompanySubcontractor, queryWrapper));
     }
+
+    @Override
+    @Transactional
+    public void saveHlgCompanySubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor) {
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        HlgCompany hlgCompany=hlgCompanyService.getById(hlgCompanySubcontractor.getCompanyId());
+        hlgCompanySubcontractor.setSysOrgCode(hlgCompany.getSysOrgCode());
+        hlgCompanySubcontractor.setCreateBy(sysUser.getUsername());
+        hlgCompanySubcontractor.setUpdateTime(new Date());
+        hlgCompanySubcontractor.setUpdateBy(sysUser.getUsername());
+        hlgCompanySubcontractor.setIsLock(1);
+        baseMapper.saveHlgCompanySubcontractor(hlgCompanySubcontractor);
+        HlgCompanySubcontractorContract hlgCompanySubcontractorContract=new HlgCompanySubcontractorContract();
+        hlgCompanySubcontractorContract.setServiceContract(hlgCompanySubcontractor.getServiceContract());
+        hlgCompanySubcontractorContract.setCompanySubcontractorId(hlgCompanySubcontractor.getId());
+        hlgCompanySubcontractorContract.setSysOrgCode(hlgCompany.getSysOrgCode());
+        hlgCompanySubcontractorContract.setGenerateTime(new Date());
+        hlgCompanySubcontractorContract.setGenerateBy(sysUser.getUsername());
+        hlgCompanySubcontractorContractService.save(hlgCompanySubcontractorContract);
+    }
+
+    @Override
+    @Transactional
+    public void isOnSubcontractor(HlgCompanySubcontractor hlgCompanySubcontractor) {
+        updateById(hlgCompanySubcontractor);
+    }
 }