|
|
@@ -120,7 +120,7 @@ public class SystemController extends BaseController {
|
|
|
userEntity.setBirthday("-");
|
|
|
userEntity.setGender("-");
|
|
|
userEntity.setPetName("游离用户");
|
|
|
- userEntity.setProfession("-");
|
|
|
+ userEntity.setProfession(DateUtil.now());
|
|
|
userEntity.setAdditionInfo("游离用户");
|
|
|
userEntity.setPhone(SnowFlakeUtil.getNextId());
|
|
|
userEntity.setRoleType(UserRole.COMMON.getType());
|
|
|
@@ -613,20 +613,19 @@ public class SystemController extends BaseController {
|
|
|
return "hello";
|
|
|
}
|
|
|
|
|
|
- @GetMapping("/addItem")
|
|
|
- public void addItem(String fileName,String flag){
|
|
|
- File file = new File("C:\\Users\\Administrator\\Desktop\\推广量表\\"+fileName+".xlsx");
|
|
|
+ @GetMapping("/updateContent")
|
|
|
+ public void addItem(String flag){
|
|
|
try {
|
|
|
- List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());
|
|
|
List<ScaleEntity> scaleEntities = scaleService.getScaleByFlag(flag);
|
|
|
- List<List<Object>> an = datas.get(5);
|
|
|
- for (int i=5;i<scaleEntities.size();i++){
|
|
|
+ for (int i= 0;i<scaleEntities.size();i++){
|
|
|
ScaleEntity entity = scaleEntities.get(i);
|
|
|
- entity.setCheckItems(an.get(i-5).get(2).toString());
|
|
|
- log.info(entity.toString());
|
|
|
- //scaleService.saveScale(entity);
|
|
|
+ String content = entity.getAnswer();
|
|
|
+ if (content.contains("。")){
|
|
|
+ log.info(content);
|
|
|
|
|
|
|
|
|
+ log.info(entity.toString());
|
|
|
+ }
|
|
|
}
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
@@ -741,14 +740,14 @@ public class SystemController extends BaseController {
|
|
|
try {
|
|
|
List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());
|
|
|
List<ScaleMarksEntity> scaleMarksEntities = scaleMarksService.getScaleMarksByFlag(flag);
|
|
|
- List<List<Object>> markObj = datas.get(2);
|
|
|
+ List<List<Object>> markObj = datas.get(5);
|
|
|
for (int i =0;i<markObj.size();i++){
|
|
|
List<Object> objects = markObj.get(i);
|
|
|
ScaleMarksEntity entity = new ScaleMarksEntity();
|
|
|
entity.setName(objects.get(0).toString());
|
|
|
entity.setScoreStart(objects.get(1).toString());
|
|
|
entity.setScoreEnd(objects.get(2).toString());
|
|
|
- entity.setSymptom("无");
|
|
|
+ entity.setSymptom(objects.get(3).toString());
|
|
|
entity.setImprovementSuggestions(objects.get(4).toString());
|
|
|
entity.setFlag(flag);
|
|
|
entity.setReference("无");
|
|
|
@@ -756,7 +755,7 @@ public class SystemController extends BaseController {
|
|
|
entity.setNameExplain("无");
|
|
|
entity.setSuggestion("无");
|
|
|
entity.setIsTotalScoreExplain("否");
|
|
|
- entity.setScoringType("2");
|
|
|
+ entity.setScoringType("0");
|
|
|
log.info(entity.toString());
|
|
|
//scaleMarksService.saveScaleMarks(entity);
|
|
|
}
|
