Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -986,7 +986,7 @@ public class SysUserController extends BaseController {
         sysDeptVo.setManagementSource(sysDept.getManagementSource()); //机构来源
         sysDeptVo.setOrderNum(0);
         sysDeptVo.setCreateTime(new Date());
-        log.info("------------------团队长添加部门-----------------------");
+        log.info("------------------团队长添加先调添加部门-----------------------");
         sysDeptService.addDept(sysDeptVo);
 
 

src/main/java/com/ydtech/modules/admin/model/vo/TaskStatisticsVo.java

@@ -41,6 +41,15 @@ public class TaskStatisticsVo implements Serializable {
     private String houseId;
 
 
+    @ApiModelProperty(value = "合作公司省机构")
+    private String parterProvinceId;
+
+    @ApiModelProperty(value = "合作公司市机构")
+    private String parterCityId;
+
+    @ApiModelProperty(value = "合作公司县机构id")
+    private String parterCountyId;
+
     @ApiModelProperty(value = "时间筛选开始")
     private String createtimeStart;
 

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -205,7 +205,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public SysDeptVo addDept(SysDeptVo sysDeptVo) {
 
         SysDept sysDept = new SysDept();
@@ -299,8 +299,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
                 updateById(i);
             });
         }
-        log.info("------------------添加部门-----------------------");
         boolean b = save(sysDept);
+        log.info("------------------添加部门成功-----------------------");
         AssertionUtils.isSucceed(b, "删除失败");
         sysDeptVo.setId(sysDept.getId());
         return sysDeptVo;

src/main/java/com/ydtech/modules/admin/service/impl/TaskStatisticsServiceImpl.java

@@ -499,19 +499,19 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
             }
         }
 
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getProvinceId())){
-            String provinceId =   this.removeTrailingZeros(taskStatisticsVo.getProvinceId());
-            taskStatisticsVo.setProvinceId(provinceId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterProvinceId())){
+            String provinceId =   this.removeTrailingZeros(taskStatisticsVo.getParterProvinceId());
+            taskStatisticsVo.setParterProvinceId(provinceId);
         }
 
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCityId())){
-            String cityId =   this.removeTrailingZeros(taskStatisticsVo.getCityId());
-            taskStatisticsVo.setCityId(cityId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterCityId())){
+            String cityId =   this.removeTrailingZeros(taskStatisticsVo.getParterCityId());
+            taskStatisticsVo.setParterCityId(cityId);
         }
 
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCountyId())){
-            String countyId =   this.removeTrailingZeros(taskStatisticsVo.getCountyId());
-            taskStatisticsVo.setCountyId(countyId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterCountyId())){
+            String countyId =   this.removeTrailingZeros(taskStatisticsVo.getParterCountyId());
+            taskStatisticsVo.setParterCountyId(countyId);
         }
 
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
@@ -541,20 +541,21 @@ public class TaskStatisticsServiceImpl  implements TaskStatisticsService {
                 taskStatisticsVo.setDateType("1");
             }
         }
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getProvinceId())){
-            String provinceId =   this.removeTrailingZeros(taskStatisticsVo.getProvinceId());
-            taskStatisticsVo.setProvinceId(provinceId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterProvinceId())){
+            String provinceId =   this.removeTrailingZeros(taskStatisticsVo.getParterProvinceId());
+            taskStatisticsVo.setParterProvinceId(provinceId);
         }
 
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCityId())){
-            String cityId =   this.removeTrailingZeros(taskStatisticsVo.getCityId());
-            taskStatisticsVo.setCityId(cityId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterCityId())){
+            String cityId =   this.removeTrailingZeros(taskStatisticsVo.getParterCityId());
+            taskStatisticsVo.setParterCityId(cityId);
         }
 
-        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getCountyId())){
-            String countyId =   this.removeTrailingZeros(taskStatisticsVo.getCountyId());
-            taskStatisticsVo.setCountyId(countyId);
+        if(com.ydtech.utils.StringUtils.isNotEmpty(taskStatisticsVo.getParterCountyId())){
+            String countyId =   this.removeTrailingZeros(taskStatisticsVo.getParterCountyId());
+            taskStatisticsVo.setParterCountyId(countyId);
         }
+
         HashMap<String, String> dateMapByType = getDateMapByTypeNew(taskStatisticsVo.getDateType(), taskStatisticsVo.getCreatetimeStart(), taskStatisticsVo.getCreatetimeEnd());
         taskStatisticsVo.setCreatetimeStart(dateMapByType.get("startDate"));
         taskStatisticsVo.setCreatetimeEnd(dateMapByType.get("endDate"));

src/main/resources/mapper/modules/console/userReportMapper.xml

@@ -179,16 +179,16 @@
             <if test="vo.provinceId != null and vo.provinceId != ''">
                 and d.id like concat('%',#{vo.provinceId},'%')
             </if>
-            <if test="vo.managementSource  != null  and  vo.managementSource!=''">
-                AND  d.management_source  =#{vo.managementSource}
-            </if>
+<!--            <if test="vo.managementSource  != null  and  vo.managementSource!=''">-->
+<!--                AND  d.management_source  =#{vo.managementSource}-->
+<!--            </if>-->
 
             <if test="vo.managementSource  !=null  and   vo.managementSource  !=''">
                 <choose>
-                    <when test="vo.managementSource == '1'">
-                       and  r.role_id = 21  and   d.management_source  =#{vo.managementSource}
+                    <when test="vo.managementSource == 1 ">
+                       and  r.role_id = '21'  and   d.management_source  =#{vo.managementSource}
                     </when>
-                    <when test="vo.managementSource == '3'">
+                    <when test="vo.managementSource == 3">
                         and (  r.role_id = 3 or r.role_id = 72  )  and   d.management_source  =#{vo.managementSource}
                     </when>
                 </choose>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -2408,6 +2408,17 @@
         <if test="vo.houseId != null and vo.houseId != ''">
             and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
+
+        <if test="vo.parterProvinceId != null and vo.parterProvinceId != '' and  vo.parterCityId == null and vo.parterCountyId == null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterProvinceId},'%')
+        </if>
+        <if test="vo.parterCityId != null and vo.parterCityId != '' and vo.parterCountyId ==null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCityId},'%')
+        </if>
+        <if test="vo.parterCountyId != null and vo.parterCountyId != '' ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCountyId},'%')
+        </if>
+
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in
             <foreach collection="vo.deptIds" item="item" open="(" separator="," close=")">
@@ -2493,6 +2504,17 @@
         <if test="vo.houseId != null and vo.houseId != ''">
             and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
+
+        <if test="vo.parterProvinceId != null and vo.parterProvinceId != '' and  vo.parterCityId == null and vo.parterCountyId == null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterProvinceId},'%')
+        </if>
+        <if test="vo.parterCityId != null and vo.parterCityId != '' and vo.parterCountyId ==null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCityId},'%')
+        </if>
+        <if test="vo.parterCountyId != null and vo.parterCountyId != '' ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCountyId},'%')
+        </if>
+
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in
             <foreach collection="vo.deptIds" item="item" open="(" separator="," close=")">
@@ -2547,6 +2569,17 @@
         <if test="vo.houseId != null and vo.houseId != ''">
             and io.deptid like concat('%',#{vo.houseId},'%')
         </if>
+
+        <if test="vo.parterProvinceId != null and vo.parterProvinceId != '' and  vo.parterCityId == null and vo.parterCountyId == null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterProvinceId},'%')
+        </if>
+        <if test="vo.parterCityId != null and vo.parterCityId != '' and vo.parterCountyId ==null ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCityId},'%')
+        </if>
+        <if test="vo.parterCountyId != null and vo.parterCountyId != '' ">
+            and agree.partner_companies_id like concat('%',#{vo.parterCountyId},'%')
+        </if>
+
         <if test="vo.deptIds != null and vo.deptIds != '' and vo.deptIds.size() > 0">
             AND io.deptid  in
             <foreach collection="vo.deptIds" item="item" open="(" separator="," close=")">
@@ -3281,6 +3314,10 @@
                 AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')  BETWEEN  DATE_FORMAT( #{taskStatisticsVo.createtimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
+            <if test="taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != '' and taskStatisticsVo.auditTimeStart !=null and taskStatisticsVo.auditTimeEnd != ''">
+                AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.auditTimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.auditTimeEnd}, '%Y-%m-%d')
+            </if>
+
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
                 AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>