Browse Source

修改partyuserrankdata

dev_shibei_match
yinzuomei 5 years ago
parent
commit
29f6b0e24e
  1. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java
  2. 6
      epmet-module/data-statistical/data-statistical-server/pom.xml
  3. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java
  4. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java
  5. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java
  6. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java
  7. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PartyUserRankDataFormDTO.java

@ -14,11 +14,6 @@ public class PartyUserRankDataFormDTO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 客户id
*/
private String customerId;
/** /**
* 年Id yyyy * 年Id yyyy
*/ */

6
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -68,6 +68,12 @@
<version>2.0.0</version> <version>2.0.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-commons-extapp-auth</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ScreenCollController.java

@ -1,5 +1,7 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
import com.epmet.commons.extappauth.bean.ExternalAppRequestParam;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.screencoll.form.*; import com.epmet.dto.screencoll.form.*;
import com.epmet.service.screen.ScreenCollService; import com.epmet.service.screen.ScreenCollService;
@ -32,9 +34,11 @@ public class ScreenCollController {
* @Author zhangyong * @Author zhangyong
* @Date 10:52 2020-08-18 * @Date 10:52 2020-08-18
**/ **/
@ExternalAppRequestAuth
@PostMapping("partyuserrankdata") @PostMapping("partyuserrankdata")
public Result partyUserRankData(@RequestBody List<PartyUserRankDataFormDTO> formDTO) { public Result partyUserRankData(ExternalAppRequestParam externalAppRequestParam,@RequestBody List<PartyUserRankDataFormDTO> formDTO) {
return screenCollService.insertPartyUserRankData(formDTO); screenCollService.insertPartyUserRankData(formDTO,externalAppRequestParam.getCustomerId());
return new Result();
} }
/** /**

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/screen/ScreenPartyUserRankDataDao.java

@ -58,5 +58,5 @@ public interface ScreenPartyUserRankDataDao extends BaseDao<ScreenPartyUserRankD
* @Author zhangyong * @Author zhangyong
* @Date 10:52 2020-08-18 * @Date 10:52 2020-08-18
**/ **/
void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list); void batchInsertPartyUserRankData(@Param("list") List<PartyUserRankDataFormDTO> list,@Param("customerId")String customerId);
} }

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/ScreenCollService.java

@ -17,7 +17,7 @@ public interface ScreenCollService {
* @Author zhangyong * @Author zhangyong
* @Date 10:52 2020-08-18 * @Date 10:52 2020-08-18
**/ **/
Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO); void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId);
/** /**
* 8党建引领-党员联系群众数据 * 8党建引领-党员联系群众数据

7
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/screen/impl/ScreenCollServiceImpl.java

@ -75,20 +75,19 @@ public class ScreenCollServiceImpl implements ScreenCollService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Result insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO) { public void insertPartyUserRankData(List<PartyUserRankDataFormDTO> formDTO,String customerId) {
if (null != formDTO && formDTO.size() > NumConstant.ZERO){ if (null != formDTO && formDTO.size() > NumConstant.ZERO){
String[] orgIds = new String[formDTO.size()]; String[] orgIds = new String[formDTO.size()];
for (int i = NumConstant.ZERO; i < formDTO.size(); i++){ for (int i = NumConstant.ZERO; i < formDTO.size(); i++){
orgIds[i] = formDTO.get(i).getOrgId(); orgIds[i] = formDTO.get(i).getOrgId();
} }
screenPartyUserRankDataDao.deletePartyUserRankData(formDTO.get(NumConstant.ZERO).getCustomerId(), screenPartyUserRankDataDao.deletePartyUserRankData(customerId,
formDTO.get(NumConstant.ZERO).getYearId(), formDTO.get(NumConstant.ZERO).getYearId(),
formDTO.get(NumConstant.ZERO).getMonthId(), formDTO.get(NumConstant.ZERO).getMonthId(),
orgIds); orgIds);
screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO); screenPartyUserRankDataDao.batchInsertPartyUserRankData(formDTO,customerId);
} }
return new Result();
} }
@Override @Override

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/ScreenPartyUserRankDataDao.xml

@ -12,7 +12,7 @@
</foreach> </foreach>
</delete> </delete>
<insert id="batchInsertPartyUserRankData" parameterType="java.util.List"> <insert id="batchInsertPartyUserRankData" parameterType="map">
insert into screen_party_user_rank_data insert into screen_party_user_rank_data
( (
ID, ID,
@ -37,7 +37,7 @@
<foreach collection="list" item="item" index="index" separator=","> <foreach collection="list" item="item" index="index" separator=",">
( (
(SELECT REPLACE(UUID(), '-', '') AS id), (SELECT REPLACE(UUID(), '-', '') AS id),
#{item.customerId}, #{customerId},
#{item.yearId}, #{item.yearId},
#{item.monthId}, #{item.monthId},
#{item.orgType}, #{item.orgType},

Loading…
Cancel
Save