平台费率配置

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/controller/HlwCpSubcontractorController.java

@@ -72,6 +72,44 @@ public class HlwCpSubcontractorController extends JeecgController<HlwCpSubcontra
 		Page<HlwCpSubcontractor> pageList = hlwCpSubcontractorService.pageList(page,hlwCpSubcontractor, queryWrapper);
 		return Result.ok(pageList);
 	}
+
+
+
+	 /**
+	  * 根据服务商id查询list
+	  *
+	  * @param hlwCpSubcontractor
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "hlw_cp_subcontractor-分页列表查询")
+	 @ApiOperation(value="hlw_cp_subcontractor-分页列表查询", notes="hlw_cp_subcontractor-分页列表查询")
+	 @GetMapping(value = "/subtractList")
+	 public Result<?> subtractList(HlwCpSubcontractor hlwCpSubcontractor,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 QueryWrapper<HlwCpSubcontractor> queryWrapper = QueryGenerator.initQueryWrapperForRule(hlwCpSubcontractor, req.getParameterMap());
+		 Page<HlwCpSubcontractor> page = new Page<HlwCpSubcontractor>(pageNo, pageSize);
+		 Page<HlwCpSubcontractor> pageList = hlwCpSubcontractorService.subtractList(page,hlwCpSubcontractor, queryWrapper);
+		 return Result.ok(pageList);
+	 }
+
+
+
+	 @GetMapping(value = "/validateTime")
+	 public Result<?> validateTime(HlwCpSubcontractor hlwCpSubcontractor) {
+	 	List<HlwCpSubcontractor> hlwCpSubcontractorList= hlwCpSubcontractorService.findHlwCpSubcontractorList(hlwCpSubcontractor);
+		if(hlwCpSubcontractorList.size()>0){
+			return Result.error("有效期存在重叠！");
+		}else{
+			return Result.ok();
+		}
+	 }
+
+
 	
 	/**
 	 *   添加

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/entity/HlwCpSubcontractor.java

@@ -93,10 +93,14 @@ public class HlwCpSubcontractor implements Serializable {
     /**
      * 开始时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     /**
      * 结束时间
      */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/mapper/HlwCpSubcontractorMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.hlwcpmanager.mapper;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.hlwcpmanager.entity.HlwCpSubcontractor;
@@ -16,5 +17,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface HlwCpSubcontractorMapper extends BaseMapper<HlwCpSubcontractor> {
 
-    List<HlwCpSubcontractor> findList(Page<HlwCpSubcontractor> pageList, HlwCpSubcontractor hlwCpSubcontractor, QueryWrapper<HlwCpSubcontractor> queryWrapper);
+    List<HlwCpSubcontractor> findList(Page<HlwCpSubcontractor> pageList,@Param("hlwCpSubcontractor") HlwCpSubcontractor hlwCpSubcontractor,@Param(Constants.WRAPPER) QueryWrapper<HlwCpSubcontractor> queryWrapper);
+
+    List<HlwCpSubcontractor> subtractList(Page<HlwCpSubcontractor> page,@Param("hlwCpSubcontractor") HlwCpSubcontractor hlwCpSubcontractor,@Param(Constants.WRAPPER) QueryWrapper<HlwCpSubcontractor> queryWrapper);
+
+    List<HlwCpSubcontractor> findHlwCpSubcontractorList(@Param("hlwCpSubcontractor")HlwCpSubcontractor hlwCpSubcontractor);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/mapper/xml/HlwCpSubcontractorMapper.xml

@@ -9,10 +9,13 @@
 		a.subcontractor_id AS "subcontractorId",
 		a.cp_id AS "cpId",
 		a.service_rate AS "serviceRate",
+		a.subcontract as "subcontract",
 		a.create_time AS "createTime",
 		a.create_by AS "createBy.id",
 		a.update_time AS "updateTime",
 		a.update_by AS "updateBy.id",
+		a.start_date as "startDate",
+		a.end_date as "endDate",
 		hs.name as "hlwSubcontractorName"
 	</sql>
 
@@ -28,5 +31,23 @@
         order by a.update_time desc,a.id asc
     </select>
 
+    <select id="subtractList" resultType="org.jeecg.modules.hlwcpmanager.entity.HlwCpSubcontractor">
+        SELECT
+        <include refid="hlwCpSubcontractorColumns"/>
+        FROM hlw_cp_subcontractor a
+        <include refid="hlwCpSubcontractorJoins"/>
+        where a.subcontractor_id=#{hlwCpSubcontractor.subcontractorId}
+        order by a.update_time desc,a.id asc
+    </select>
 
+
+    <select id="findHlwCpSubcontractorList" resultType="org.jeecg.modules.hlwcpmanager.entity.HlwCpSubcontractor">
+        SELECT
+        <include refid="hlwCpSubcontractorColumns"/>
+        FROM hlw_cp_subcontractor a
+        <include refid="hlwCpSubcontractorJoins"/>
+        where a.subcontractor_id=#{hlwCpSubcontractor.subcontractorId}
+        and  to_days(a.start_date) &lt;= to_days(#{hlwCpSubcontractor.startDate})
+        and to_days(a.end_date) &gt;= to_days(#{hlwCpSubcontractor.startDate})
+    </select>
 </mapper>

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/service/IHlwCpSubcontractorService.java

@@ -6,6 +6,8 @@ import org.jeecg.modules.hlwcpmanager.entity.HlwCpSubcontractor;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.hlwtax.entity.HlwTax;
 
+import java.util.List;
+
 /**
  * @Description: hlw_cp_subcontractor
  * @Author: jeecg-boot
@@ -17,4 +19,8 @@ public interface IHlwCpSubcontractorService extends IService<HlwCpSubcontractor>
     Page<HlwCpSubcontractor> pageList(Page<HlwCpSubcontractor> page, HlwCpSubcontractor hlwCpSubcontractor, QueryWrapper<HlwCpSubcontractor> queryWrapper);
 
     void saveInfo(HlwCpSubcontractor hlwCpSubcontractor);
+
+    Page<HlwCpSubcontractor> subtractList(Page<HlwCpSubcontractor> page, HlwCpSubcontractor hlwCpSubcontractor, QueryWrapper<HlwCpSubcontractor> queryWrapper);
+
+    List<HlwCpSubcontractor> findHlwCpSubcontractorList(HlwCpSubcontractor hlwCpSubcontractor);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwcpmanager/service/impl/HlwCpSubcontractorServiceImpl.java

@@ -31,14 +31,25 @@ public class HlwCpSubcontractorServiceImpl extends ServiceImpl<HlwCpSubcontracto
         return pageList.setRecords(baseMapper.findList(pageList,hlwCpSubcontractor,queryWrapper));
     }
 
+    @Override
+    public Page<HlwCpSubcontractor> subtractList(Page<HlwCpSubcontractor> page, HlwCpSubcontractor hlwCpSubcontractor, QueryWrapper<HlwCpSubcontractor> queryWrapper) {
+        return page.setRecords(baseMapper.subtractList(page,hlwCpSubcontractor,queryWrapper));
+    }
 
     @Override
     @Transactional
     public void saveInfo(HlwCpSubcontractor hlwCpSubcontractor) {
-        List<HlwCpSetting> list= hlwCpSettingService.list();
-        if(list.size()>0){
-            hlwCpSubcontractor.setCpId(list.get(0).getId());
-            save(hlwCpSubcontractor);
+        //查询开心服务商
+        List<HlwCpSetting> cpSettingList = hlwCpSettingService.list();
+        if (cpSettingList != null && cpSettingList.size() > 0) {
+            HlwCpSetting hlwCpSetting = cpSettingList.get(0);
+            hlwCpSubcontractor.setCpId(hlwCpSetting.getId());
         }
+       save(hlwCpSubcontractor);
+    }
+
+    @Override
+    public List<HlwCpSubcontractor> findHlwCpSubcontractorList(HlwCpSubcontractor hlwCpSubcontractor) {
+        return baseMapper.findHlwCpSubcontractorList(hlwCpSubcontractor);
     }
 }